Patch for bug 274236: Variable component overlaps in ThrowCodeError; patch by me, r=wurblzap (Marc), a=justdave.
git-svn-id: svn://10.0.0.236/trunk@166689 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
3a631a5599
commit
22e4b3570a
@ -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 {
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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" %]
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user