diff options
| author | jocuri%softhome.net <> | 2004-12-14 09:58:52 +0000 |
|---|---|---|
| committer | jocuri%softhome.net <> | 2004-12-14 09:58:52 +0000 |
| commit | 982de31eeb8549a4c1d60890d788b9dd54fbc507 (patch) | |
| tree | 59fd33908b5f37c4e255980bd0b31be7806c4d06 | |
| parent | 1ed8e4bd9fada1e3973cf32bc8be4c6c327ddb76 (diff) | |
| download | bugs-982de31eeb8549a4c1d60890d788b9dd54fbc507.tar bugs-982de31eeb8549a4c1d60890d788b9dd54fbc507.tar.gz bugs-982de31eeb8549a4c1d60890d788b9dd54fbc507.tar.bz2 bugs-982de31eeb8549a4c1d60890d788b9dd54fbc507.tar.xz bugs-982de31eeb8549a4c1d60890d788b9dd54fbc507.zip | |
Patch for bug 274236: Variable component overlaps in ThrowCodeError; patch by me, r=wurblzap (Marc), a=justdave.
| -rwxr-xr-x | editflagtypes.cgi | 2 | ||||
| -rwxr-xr-x | process_bug.cgi | 2 | ||||
| -rw-r--r-- | template/en/default/global/code-error.html.tmpl | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/editflagtypes.cgi b/editflagtypes.cgi index a48dc7578..4875b4f19 100755 --- a/editflagtypes.cgi +++ b/editflagtypes.cgi @@ -484,7 +484,7 @@ sub validateComponent { defined($component_id) || ThrowCodeError("flag_type_component_nonexistent", { product => $::FORM{'product'}, - component => $::FORM{'component'} }); + name => $::FORM{'component'} }); } sub validateSortKey { diff --git a/process_bug.cgi b/process_bug.cgi index b2fc66d32..47957d193 100755 --- a/process_bug.cgi +++ b/process_bug.cgi @@ -709,7 +709,7 @@ if ($::FORM{'component'} ne $::FORM{'dontchange'}) { $comp_id = get_component_id($prod_id, $::FORM{'component'}); $comp_id || ThrowCodeError("invalid_component", - {component => $::FORM{'component'}, + {name => $::FORM{'component'}, product => $::FORM{'product'}}); DoComma(); diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index 8959437a6..42172d900 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -125,7 +125,7 @@ [% ELSIF error == "invalid_component" %] [% title = "Invalid Component" %] - The [% component FILTER html %] component doesn't exist in the + The [% name FILTER html %] component doesn't exist in the [% product FILTER html %] product. [% ELSIF error == "invalid_dimensions" %] @@ -159,7 +159,7 @@ is invalid. [% ELSIF error == "flag_type_component_nonexistent" %] - The component <em>[% component FILTER html %]</em> does not exist + The component <em>[% name FILTER html %]</em> does not exist in the product <em>[% product FILTER html %]</em>. [% ELSIF error == "flag_type_component_without_product" %] |