From: timeless%mozdev.org <>
Date: Tue, 10 Jul 2007 12:08:12 +0000 (+0000)
Subject: Bug 365472 rename 'token_inexistent' to 'token_does_not_exist' or something
X-Git-Tag: bugzilla-3.1.2~156
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3514b985595e35b69dd3a4e0819aa94dc80a399f;p=thirdparty%2Fbugzilla.git

Bug 365472 rename 'token_inexistent' to 'token_does_not_exist' or something
r=lpsolit a=lpsolit
---

diff --git a/attachment.cgi b/attachment.cgi
index 923af74b76..690a42d671 100755
--- a/attachment.cgi
+++ b/attachment.cgi
@@ -684,7 +684,7 @@ sub delete_attachment {
                   && ($event eq 'attachment' . $attachment->id))
         {
             # The token is invalid.
-            ThrowUserError('token_inexistent');
+            ThrowUserError('token_does_not_exist');
         }
 
         # The token is valid. Delete the content of the attachment.
diff --git a/post_bug.cgi b/post_bug.cgi
index 35a43feaa4..b873d8f72f 100755
--- a/post_bug.cgi
+++ b/post_bug.cgi
@@ -62,7 +62,7 @@ if ($token) {
               && ($old_bug_id =~ "^createbug:"))
     {
         # The token is invalid.
-        ThrowUserError('token_inexistent');
+        ThrowUserError('token_does_not_exist');
     }
 
     $old_bug_id =~ s/^createbug://;
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index c2bbde28c5..05aa0e4b34 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1412,7 +1412,7 @@
     <tt>[% product FILTER html %]</tt> product, which exceeds the maximum of
     [%+ max FILTER html %] votes for this product.
 
-  [% ELSIF error == "token_inexistent" %]
+  [% ELSIF error == "token_does_not_exist" %]
     [% title = "Token Does Not Exist" %]
     The token you submitted does not exist, has expired, or has
     been canceled.
diff --git a/token.cgi b/token.cgi
index 66ce2c052d..a07a969fd1 100755
--- a/token.cgi
+++ b/token.cgi
@@ -72,7 +72,7 @@ if ($cgi->param('t')) {
   # Make sure the token exists in the database.
   my ($tokentype) = $dbh->selectrow_array('SELECT tokentype FROM tokens
                                            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.
   if ( grep($::action eq $_ , qw(cfmpw cxlpw chgpw)) && $tokentype ne 'password' ) {