From: Dan Scott <dscott@laurentian.ca>
Date: Thu, 11 Sep 2014 01:36:29 +0000 (-0400)
Subject: "next" doesn't work if you're not in a for loop
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=b4cc78f4a2ddcb64609602b062854f8783f7b31c;p=contrib%2FConifer.git

"next" doesn't work if you're not in a for loop

This was causing grievous "Internal server error" problems
when people actually did enter their email address. More
robust, more better. Yay.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
---

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
index 60c998069f..1e03918fb2 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
@@ -419,9 +419,7 @@ sub load_login {
         $args->{barcode} = $username;
     } else {
         # do we need to append an email hostname?
-        if ($ou_email_host) {
-            # Assume they already passed in an email address
-            next if $username =~ m/\@/;
+        if ($ou_email_host and $username !~ m/\@/) {
             $username .= "\@$ou_email_host";
         }
         $args->{username} = $username;