summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/Error.pm12
-rw-r--r--extensions/Voting/template/en/default/hook/global/user-error-errors.html.tmpl4
2 files changed, 5 insertions, 11 deletions
diff --git a/Bugzilla/Error.pm b/Bugzilla/Error.pm
index 03bf04f83..37b28095a 100644
--- a/Bugzilla/Error.pm
+++ b/Bugzilla/Error.pm
@@ -192,24 +192,18 @@ sub ThrowTemplateError {
my $maintainer = Bugzilla->params->{'maintainer'};
my $error = html_quote($vars->{'template_error_msg'});
my $error2 = html_quote($template->error());
+ my $url = html_quote(Bugzilla->cgi->self_url);
+
print <<END;
- <tt>
<p>
Bugzilla has suffered an internal error. Please save this page and
send it to $maintainer with details of what you were doing at the
time this message appeared.
</p>
- <script type="text/javascript"> <!--
- document.write("<p>URL: " +
- document.location.href.replace(/&/g,"&amp;")
- .replace(/</g,"&lt;")
- .replace(/>/g,"&gt;") + "</p>");
- // -->
- </script>
+ <p>URL: $url</p>
<p>Template->process() failed twice.<br>
First error: $error<br>
Second error: $error2</p>
- </tt>
END
}
exit;
diff --git a/extensions/Voting/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/Voting/template/en/default/hook/global/user-error-errors.html.tmpl
index 55c32d460..644c827a6 100644
--- a/extensions/Voting/template/en/default/hook/global/user-error-errors.html.tmpl
+++ b/extensions/Voting/template/en/default/hook/global/user-error-errors.html.tmpl
@@ -30,14 +30,14 @@
[% admindocslinks = {'voting.html' => 'Setting up the voting feature'} %]
You may only use at most [% max FILTER html %] votes for a single
[%+ terms.bug %] in the
- <tt>[% product FILTER html %]</tt> product, but you are trying to
+ <em>[% product FILTER html %]</em> product, but you are trying to
use [% votes FILTER html %].
[% ELSIF error == "voting_too_many_votes_for_product" %]
[% title = "Illegal Vote" %]
[% admindocslinks = {'voting.html' => 'Setting up the voting feature'} %]
You tried to use [% votes FILTER html %] votes in the
- <tt>[% product FILTER html %]</tt> product, which exceeds the maximum of
+ <em>[% product FILTER html %]</em> product, which exceeds the maximum of
[%+ max FILTER html %] votes for this product.
[% END %]