Bug 40933, Bug 63249

git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@1093 6955db30-a419-402b-8a0d-67ecbb4d7f56

Bugzilla/CGI.pm

@@ -245,7 +245,7 @@ sub multipart_init {
 # Have to add the cookies in.
 sub multipart_start {
     my $self = shift;
-    
+
     my %args = @_;
 
     # CGI.pm::multipart_start doesn't honour its own charset information, so
@@ -256,7 +256,7 @@ sub multipart_start {
         # and add the specified one
         $args{-type} .= '; charset=' . $self->charset();
     }
-        
+
     my $headers = $self->SUPER::multipart_start(%args);
     # Eliminate the one extra CRLF at the end.
     $headers =~ s/$CGI::CRLF$//;
@@ -267,6 +267,7 @@ sub multipart_start {
         $headers .= "Set-Cookie: ${cookie}${CGI::CRLF}";
     }
     $headers .= $CGI::CRLF;
+
     return $headers;
 }
 
@@ -301,6 +302,7 @@ sub send_multipart_start
 {
     my $self = shift;
     $self->{_header_sent} = 1;
+    $self->{_multipart_started}++;
     print $self->multipart_start(@_);
 }
 
@@ -308,6 +310,7 @@ sub send_multipart_init
 {
     my $self = shift;
     $self->{_header_sent} = 1;
+    $self->{_multipart_initialized} = 1;
     print $self->multipart_init(@_);
 }
 
@@ -315,6 +318,7 @@ sub send_multipart_end
 {
     my $self = shift;
     $self->{_header_sent} = 1;
+    $self->{_multipart_started}--;
     print $self->multipart_end(@_);
 }
 
@@ -322,6 +326,7 @@ sub send_multipart_final
 {
     my $self = shift;
     $self->{_header_sent} = 1;
+    $self->{_multipart_closed} = 1;
     print $self->multipart_final(@_);
 }
 

Bugzilla/Error.pm

@@ -179,7 +179,18 @@ sub _throw_error
 
     if ($mode == ERROR_MODE_WEBPAGE)
     {
-        Bugzilla->cgi->send_header;
+        if (Bugzilla->cgi->{_multipart_initialized})
+        {
+            Bugzilla->cgi->send_multipart_end();
+            Bugzilla->cgi->send_multipart_start(
+                -type => 'text/html',
+                -content_disposition => 'inline',
+            );
+        }
+        else
+        {
+            Bugzilla->cgi->send_header;
+        }
         print $message;
     }
     elsif ($mode == ERROR_MODE_DIE_SOAP_FAULT || $mode == ERROR_MODE_JSON_RPC)

Bugzilla/Search.pm

@@ -167,7 +167,7 @@ sub COLUMNS {
         $special_sql{$col} = "map_${col}s.name";
         $columns{$col}{joins} = [
             "INNER JOIN ${col}s AS map_${col}s ON ".
-            ($col eq 'classification' ? "products" : "bugs").
+            ($col eq 'classification' ? "map_products" : "bugs").
             ".${col}_id = map_${col}s.id"
         ];
         if ($col eq 'classification')
@@ -196,7 +196,7 @@ sub COLUMNS {
                 if (!$special_sql{$subid})
                 {
                     $columns{$id.'_'.$subid} = {
-                        name  => "bugs_$id.$subid",
+                        name  => "bugs_$id.".$subfield->name,
                         title => $field->description . ' ' . $subfield->description,
                         joins => $join,
                     };

buglist.cgi

@@ -362,11 +362,11 @@ sub _close_standby_message {
     if ($serverpush) {
         $cgi->send_multipart_end();
         $cgi->send_multipart_start(-type                => $contenttype,
-                                    -content_disposition => $disposition);
+                                   -content_disposition => $disposition);
     }
     else {
         $cgi->send_header(-type                => $contenttype,
-                           -content_disposition => $disposition);
+                          -content_disposition => $disposition);
     }
 }