diff options
author | gerv%gerv.net <> | 2002-09-27 08:25:11 +0200 |
---|---|---|
committer | gerv%gerv.net <> | 2002-09-27 08:25:11 +0200 |
commit | 37dc5c7799eb5a6d7385f6fda76bb96747979a09 (patch) | |
tree | 024c0a39f671ad56684493ea2182a5db5ffe11e9 /CGI.pl | |
parent | ca45228232819bfccdb6dca4f89fe45d3923f333 (diff) | |
download | bugzilla-37dc5c7799eb5a6d7385f6fda76bb96747979a09.tar.gz bugzilla-37dc5c7799eb5a6d7385f6fda76bb96747979a09.tar.xz |
Bug 170986 - General Summary reports don't work with taint checking. Also fixes Throw*Error's $extra_vars parameter. Patch by gerv; r=bbaetz.
Diffstat (limited to 'CGI.pl')
-rw-r--r-- | CGI.pl | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -854,8 +854,10 @@ sub ThrowCodeError { SendSQL("UNLOCK TABLES") if $unlock_tables; # Copy the extra_vars into the vars hash - @::vars{keys %$extra_vars} = values %$extra_vars; - + foreach my $var (keys %$extra_vars) { + $vars->{$var} = $extra_vars->{$var}; + } + # We may one day log something to file here also. $vars->{'variables'} = $extra_vars; @@ -873,8 +875,10 @@ sub ThrowUserError { SendSQL("UNLOCK TABLES") if $unlock_tables; # Copy the extra_vars into the vars hash - @::vars{keys %$extra_vars} = values %$extra_vars; - + foreach my $var (keys %$extra_vars) { + $vars->{$var} = $extra_vars->{$var}; + } + print "Content-type: text/html\n\n" if !$vars->{'header_done'}; $template->process("global/user-error.html.tmpl", $vars) || ThrowTemplateError($template->error()); |