aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjustdave%syndicomm.com <>2004-04-15 12:44:47 +0000
committerjustdave%syndicomm.com <>2004-04-15 12:44:47 +0000
commitbfa503a07fb840d32369a3399821c71dd380445f (patch)
tree57a3cd3ab0ac597bcde6182ad9147c994f44c115
parentf967249484892a3ab49b3b369b0f6995fee60288 (diff)
downloadbugs-bfa503a07fb840d32369a3399821c71dd380445f.tar
bugs-bfa503a07fb840d32369a3399821c71dd380445f.tar.gz
bugs-bfa503a07fb840d32369a3399821c71dd380445f.tar.bz2
bugs-bfa503a07fb840d32369a3399821c71dd380445f.tar.xz
bugs-bfa503a07fb840d32369a3399821c71dd380445f.zip
Backing out checkin from bug 238865: patch was negatively reviewed post-mortem.
a=justdave
-rwxr-xr-xpage.cgi13
-rw-r--r--template/en/default/global/code-error.html.tmpl5
-rw-r--r--template/en/default/pages/linked.html.tmpl6
3 files changed, 6 insertions, 18 deletions
diff --git a/page.cgi b/page.cgi
index 6e78317fc..b68a9313b 100755
--- a/page.cgi
+++ b/page.cgi
@@ -42,19 +42,14 @@ Bugzilla->login();
my $cgi = Bugzilla->cgi;
-my $id = $cgi->param('id');
-if ($id) {
+if ($::FORM{'id'}) {
# Remove all dodgy chars, and split into name and ctype.
- $id =~ s/[^\w\-\.]//g;
- $id =~ /(.*)\.(.*)/;
- if (!$2) {
- # if this regexp fails to match completely, something bad came in
- ThrowCodeError("bad_page_cgi_id", { "page_id" => $id });
- }
+ $::FORM{'id'} =~ s/[^\w\-\.]//g;
+ $::FORM{'id'} =~ /(.*)\.(.*)/;
my $format = GetFormat("pages/$1", undef, $2);
- $cgi->param('id', $id);
+ $vars->{'form'} = \%::FORM;
print $cgi->header($format->{'ctype'});
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index c5233b8e8..342d67102 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -56,11 +56,6 @@
[% ELSIF error == "authres_unhandled" %]
An authorization handler return value was not handled by the login code.
- [% ELSIF error == "bad_page_cgi_id" %]
- [% title = "Invalid Page ID" %]
- The ID <code>[% page_id FILTER html %]</code> is not a
- valid page identifier.
-
[% ELSIF error == "bug_error" %]
Trying to retrieve [% terms.bug %] [%+ bug.bug_id FILTER html %] returned
the error [% bug.error FILTER html %].
diff --git a/template/en/default/pages/linked.html.tmpl b/template/en/default/pages/linked.html.tmpl
index fcb5ee9d0..2a3521a35 100644
--- a/template/en/default/pages/linked.html.tmpl
+++ b/template/en/default/pages/linked.html.tmpl
@@ -21,8 +21,6 @@
#%]
[% INCLUDE global/header.html.tmpl title = "Your Linkified Text" %]
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
<p>
Copy and paste the text below:
@@ -32,7 +30,7 @@
<p>
<pre>
-[%- cgi.param("text") FILTER quoteUrls FILTER html -%]
+[%- form.text FILTER quoteUrls FILTER html -%]
</pre>
</p>
@@ -47,7 +45,7 @@
<p>
<pre>
-[%- cgi.param("text") FILTER quoteUrls -%]
+[%- form.text FILTER quoteUrls -%]
</pre>
</p>