Changeset 21131 for trunk/wp-admin/includes/class-wp-upgrader.php

Timestamp:

06/26/2012 05:21:04 AM (12 years ago)

Author:

nacin

Message:

Allow switch_theme() to take a single $stylesheet argument.

It now effectively has two function definitions:
function switch_theme( $stylesheet )
function switch_theme( $template, $stylesheet )

fixes #21075.

File:

• trunk/wp-admin/includes/class-wp-upgrader.php (modified) (1 diff)

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

@@ -954 +954 @@
             return $return;
 
-        // Ensure stylesheet name hasnt changed after the upgrade:
-        // @TODO: Note, This doesn't handle the Template changing, or the Template name changing.
+        // Ensure stylesheet name hasn't changed after the upgrade:
         if ( $theme == get_stylesheet() && $theme != $this->result['destination_name'] ) {
-            $theme_info = $this->theme_info();
+            wp_clean_themes_cache();
             $stylesheet = $this->result['destination_name'];
-            $template = $theme_info->get_template();
-            switch_theme($template, $stylesheet, true);
+            switch_theme( $stylesheet );
         }