Skip to content

bugzilla
bugzilla
Commit 336bf13a authored by myk%mozilla.org's avatar myk%mozilla.org
Browse files
Options

Fix for bug 150925: make email address changes work.

2xr=bbaetz
parent c1c07ea6
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 8 deletions
Bugzilla/Token.pm
View file @ 336bf13a
...@@ -257,10 +257,9 @@ sub HasEmailChangeToken { ...@@ -257,10 +257,9 @@ sub HasEmailChangeToken {
my ($userid) = @_; my ($userid) = @_;
&::SendSQL("SELECT token FROM tokens &::SendSQL("SELECT token FROM tokens WHERE userid = $userid " .
WHERE userid = $userid "AND (tokentype = 'emailnew' OR tokentype = 'emailold') " .
AND tokentype = 'emailnew' "LIMIT 1");
OR tokentype = 'emailold' LIMIT 1");
my ($token) = &::FetchSQLData(); my ($token) = &::FetchSQLData();
return $token; return $token;
......
Token.pm
View file @ 336bf13a
...@@ -257,10 +257,9 @@ sub HasEmailChangeToken { ...@@ -257,10 +257,9 @@ sub HasEmailChangeToken {
my ($userid) = @_; my ($userid) = @_;
&::SendSQL("SELECT token FROM tokens &::SendSQL("SELECT token FROM tokens WHERE userid = $userid " .
WHERE userid = $userid "AND (tokentype = 'emailnew' OR tokentype = 'emailold') " .
AND tokentype = 'emailnew' "LIMIT 1");
OR tokentype = 'emailold' LIMIT 1");
my ($token) = &::FetchSQLData(); my ($token) = &::FetchSQLData();
return $token; return $token;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment