summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorwurblzap%gmail.com <>2007-06-22 14:29:24 +0200
committerwurblzap%gmail.com <>2007-06-22 14:29:24 +0200
commit8699690c76360c62e748f5557831243322655bfd (patch)
tree7794f17fc1239bc2053929f54f7b24ca5b90c8ee /Bugzilla
parent1609f8fcf3d9b2b68cc0892e3948402020e4ea09 (diff)
downloadbugzilla-8699690c76360c62e748f5557831243322655bfd.tar.gz
bugzilla-8699690c76360c62e748f5557831243322655bfd.tar.xz
Bug 383745: Incorrect charset specification in "please wait" screen when server push is in use.
Patch by Marc Schumann <wurblzap@gmail.com>, r=mkanat, a=mkanat
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/CGI.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm
index 7b76f6af0..b4e2aca6c 100644
--- a/Bugzilla/CGI.pm
+++ b/Bugzilla/CGI.pm
@@ -194,13 +194,13 @@ sub multipart_start {
my %args = @_;
- # CGI.pm::multipart_start doesn't accept a -charset parameter, so
+ # CGI.pm::multipart_start doesn't honour its own charset information, so
# we do it ourselves here
- if (defined $args{-charset} && defined $args{-type}) {
+ if (defined $self->charset() && defined $args{-type}) {
# Remove any existing charset specifier
$args{-type} =~ s/;.*$//;
# and add the specified one
- $args{-type} .= "; charset=$args{-charset}";
+ $args{-type} .= '; charset=' . $self->charset();
}
my $headers = $self->SUPER::multipart_start(%args);