Commit 3514b985 authored by timeless%mozdev.org's avatar timeless%mozdev.org

Bug 365472 rename 'token_inexistent' to 'token_does_not_exist' or something

r=lpsolit a=lpsolit
parent 01d86120
...@@ -684,7 +684,7 @@ sub delete_attachment { ...@@ -684,7 +684,7 @@ sub delete_attachment {
&& ($event eq 'attachment' . $attachment->id)) && ($event eq 'attachment' . $attachment->id))
{ {
# The token is invalid. # The token is invalid.
ThrowUserError('token_inexistent'); ThrowUserError('token_does_not_exist');
} }
# The token is valid. Delete the content of the attachment. # The token is valid. Delete the content of the attachment.
......
...@@ -62,7 +62,7 @@ if ($token) { ...@@ -62,7 +62,7 @@ if ($token) {
&& ($old_bug_id =~ "^createbug:")) && ($old_bug_id =~ "^createbug:"))
{ {
# The token is invalid. # The token is invalid.
ThrowUserError('token_inexistent'); ThrowUserError('token_does_not_exist');
} }
$old_bug_id =~ s/^createbug://; $old_bug_id =~ s/^createbug://;
......
...@@ -1412,7 +1412,7 @@ ...@@ -1412,7 +1412,7 @@
<tt>[% product FILTER html %]</tt> product, which exceeds the maximum of <tt>[% product FILTER html %]</tt> product, which exceeds the maximum of
[%+ max FILTER html %] votes for this product. [%+ max FILTER html %] votes for this product.
[% ELSIF error == "token_inexistent" %] [% ELSIF error == "token_does_not_exist" %]
[% title = "Token Does Not Exist" %] [% title = "Token Does Not Exist" %]
The token you submitted does not exist, has expired, or has The token you submitted does not exist, has expired, or has
been canceled. been canceled.
......
...@@ -72,7 +72,7 @@ if ($cgi->param('t')) { ...@@ -72,7 +72,7 @@ if ($cgi->param('t')) {
# Make sure the token exists in the database. # Make sure the token exists in the database.
my ($tokentype) = $dbh->selectrow_array('SELECT tokentype FROM tokens my ($tokentype) = $dbh->selectrow_array('SELECT tokentype FROM tokens
WHERE token = ?', undef, $::token); WHERE token = ?', undef, $::token);
$tokentype || ThrowUserError("token_inexistent"); $tokentype || ThrowUserError("token_does_not_exist");
# Make sure the token is the correct type for the action being taken. # Make sure the token is the correct type for the action being taken.
if ( grep($::action eq $_ , qw(cfmpw cxlpw chgpw)) && $tokentype ne 'password' ) { if ( grep($::action eq $_ , qw(cfmpw cxlpw chgpw)) && $tokentype ne 'password' ) {
......
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