Ticket #25254: 25254.2.diff

src/wp-admin/includes/class-wp-upgrader.php

@@ -299 +299 @@
                 if ( ! $res ) //Mainly for non-connected filesystem.
                         return false;
 
+                if ( ! $is_multi ) // call $this->header separately if running multiple times
+                        $this->skin->header();
+
+                $this->skin->before();
+
                 if ( is_wp_error($res) ) {
                         $this->skin->error($res);
+                        $this->skin->after();
+                        if ( ! $is_multi )
+                                $this->skin->footer();
                         return $res;
                 }
 
-                if ( !$is_multi ) // call $this->header separately if running multiple times
-                        $this->skin->header();
-
-                $this->skin->before();
-
                 //Download the package (Note, This just returns the filename of the file if the package is a local file)
                 $download = $this->download_package( $package );
                 if ( is_wp_error($download) ) {
                         $this->skin->error($download);
                         $this->skin->after();
+                        if ( ! $is_multi )
+                                $this->skin->footer();
                         return $download;
                 }
 
@@ -324 +329 @@
                 if ( is_wp_error($working_dir) ) {
                         $this->skin->error($working_dir);
                         $this->skin->after();
+                        if ( ! $is_multi )
+                                $this->skin->footer();
                         return $working_dir;
                 }
 
@@ -345 +352 @@
                         //Install Succeeded
                         $this->skin->feedback('process_success');
                 }
+
                 $this->skin->after();
 
-                if ( !$is_multi )
+                if ( ! $is_multi )
                         $this->skin->footer();
 
                 return $result;