Patch for bug 274236: Variable component overlaps in ThrowCodeError; patch by me...

diff --git a/editflagtypes.cgi b/editflagtypes.cgi
index a48dc757889ec3c4a528372fe10116d3e1837f5d..4875b4f19f31a977b867d91ef30286709ea319d7 100755 (executable)
--- 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 b2fc66d326332abf800eff1b6a081be13cbe49f3..47957d193596b7a43ded36ccac3b15cf3ec9f54b 100755 (executable)
--- 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 8959437a6e0677d174fc2d8781471a26e4798632..42172d900ab323fcfc32ec905ce5b8b2655589cf 100644 (file)
--- 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" %]