Changeset 25370

Timestamp:

09/12/2013 02:42:10 AM (12 years ago)

Author:

SergeyBiryukov

Message:

Consistently call skin methods in WP_Upgrader. fixes #25254.

File:

• trunk/src/wp-admin/includes/class-wp-upgrader.php (modified) (4 diffs)

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

@@ -300 +300 @@
             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)
@@ -315 +318 @@
             $this->skin->error($download);
             $this->skin->after();
+            if ( ! $is_multi )
+                $this->skin->footer();
             return $download;
         }
@@ -325 +330 @@
             $this->skin->error($working_dir);
             $this->skin->after();
+            if ( ! $is_multi )
+                $this->skin->footer();
             return $working_dir;
         }
@@ -346 +353 @@
             $this->skin->feedback('process_success');
         }
+
         $this->skin->after();
 
-        if ( !$is_multi )
+        if ( ! $is_multi )
             $this->skin->footer();