Fix for bug 150925: make email address changes work.

2xr=bbaetz

webtools/bugzilla/Bugzilla/Token.pm

@@ -257,10 +257,9 @@ sub HasEmailChangeToken {
     
     my ($userid) = @_;
     
-    &::SendSQL("SELECT token FROM tokens 
-                 WHERE userid = $userid 
-                   AND tokentype = 'emailnew' 
-                    OR tokentype = 'emailold' LIMIT 1");
+    &::SendSQL("SELECT token FROM tokens WHERE userid = $userid " . 
+               "AND (tokentype = 'emailnew' OR tokentype = 'emailold') " . 
+               "LIMIT 1");
     my ($token) = &::FetchSQLData();
     
     return $token;

webtools/bugzilla/Token.pm

@@ -257,10 +257,9 @@ sub HasEmailChangeToken {
     
     my ($userid) = @_;
     
-    &::SendSQL("SELECT token FROM tokens 
-                 WHERE userid = $userid 
-                   AND tokentype = 'emailnew' 
-                    OR tokentype = 'emailold' LIMIT 1");
+    &::SendSQL("SELECT token FROM tokens WHERE userid = $userid " . 
+               "AND (tokentype = 'emailnew' OR tokentype = 'emailold') " . 
+               "LIMIT 1");
     my ($token) = &::FetchSQLData();
     
     return $token;