Bug 200198 - user-error.html.tmpl's use [% changedsince %] instead of $changedsince

r=gerv, a=justdave

diff --git a/duplicates.cgi b/duplicates.cgi
index 64a3f7ab3c6eb7584bfd43c1acc9fbc38dc49841..dc65ef5026aae385f679f5f909d0edc09be88f8b 100755 (executable)
--- a/duplicates.cgi
+++ b/duplicates.cgi
@@ -137,6 +137,15 @@ while (my ($key, $value) = each %count) {
     delete $count{$key} if $sortvisible && (lsearch(\@buglist, $key) == -1);
 }
 
+my $origmaxrows = $maxrows;
+detaint_natural($maxrows)
+  || ThrowUserError("invalid_maxrows", { maxrows => $origmaxrows});
+
+my $origchangedsince = $changedsince;
+detaint_natural($changedsince)
+  || ThrowUserError("invalid_changedsince", 
+                    { changedsince => $origchangedsince });
+
 # Try and open the database from "changedsince" days ago
 my $dobefore = 0;
 my %delta;
@@ -159,15 +168,6 @@ if (!tie(%before, 'AnyDBM_File', "data/duplicates/dupes$whenever",
     $dobefore = 1;
 }
 
-my $origmaxrows = $maxrows;
-detaint_natural($maxrows)
-  || ThrowUserError("invalid_maxrows", { maxrows => $origmaxrows});
-
-my $origchangedsince = $changedsince;
-detaint_natural($changedsince)
-  || ThrowUserError("invalid_changedsince", 
-                    { changedsince => $origchangedsince });
-
 my @bugs;
 my @bug_ids; 
 

diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 1aaa581b64d5fb230425c95dbc5abd9314e68819..f626c640b3484fb9088069db6ced28ed4f4cb59d 100644 (file)
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -446,7 +446,8 @@
 
   [% ELSIF error == "no_dupe_stats_error_whenever" %]
     [% title = "Error Reading Previous Dupes File" %]
-    An error occurred opening $changedsince days ago ($whenever)'s dupes file:
+    An error occurred opening [% changedsince FILTER html %] days ago
+    ([% whenever FILTER html %])'s dupes file:
     [% error_msg FILTER html %].
      
   [% ELSIF error == "no_dupe_stats_error_yesterday" %]