From: myk%mozilla.org <>
Date: Tue, 9 Jul 2002 09:16:56 +0000 (+0000)
Subject: Fix for bug 150925: make email address changes work.
X-Git-Tag: bugzilla-2.17.1~273
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=336bf13a0a34b33f4977770128bdea4da81fa486;p=thirdparty%2Fbugzilla.git

Fix for bug 150925: make email address changes work.
2xr=bbaetz
---

diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm
index 358a1bb229..78eef9335f 100644
--- a/Bugzilla/Token.pm
+++ b/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;
diff --git a/Token.pm b/Token.pm
index 358a1bb229..78eef9335f 100644
--- a/Token.pm
+++ b/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;