summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormyk%mozilla.org <>2002-07-09 11:16:56 +0200
committermyk%mozilla.org <>2002-07-09 11:16:56 +0200
commit336bf13a0a34b33f4977770128bdea4da81fa486 (patch)
tree34b52cd12a7115e6532326a89362da300202919b
parentc1c07ea635604263e521f1493521bae1d32ea77d (diff)
downloadbugzilla-336bf13a0a34b33f4977770128bdea4da81fa486.tar.gz
bugzilla-336bf13a0a34b33f4977770128bdea4da81fa486.tar.xz
Fix for bug 150925: make email address changes work.
2xr=bbaetz
-rw-r--r--Bugzilla/Token.pm7
-rw-r--r--Token.pm7
2 files changed, 6 insertions, 8 deletions
diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm
index 358a1bb22..78eef9335 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 358a1bb22..78eef9335 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;