Changeset 18630 for trunk/wp-includes/theme.php

Timestamp:

09/02/2011 10:13:55 PM (13 years ago)

Author:

azaozz

Message:

Avoid losing widgets when switching themes - take one, props aaroncampbell, see #17979

File:

• trunk/wp-includes/theme.php (modified) (1 diff)

trunk/wp-includes/theme.php

@@ -1249 +1249 @@
     global $wp_theme_directories;
 
+    $old_theme = get_current_theme();
+
     update_option('template', $template);
     update_option('stylesheet', $stylesheet);
+
     if ( count($wp_theme_directories) > 1 ) {
         update_option('template_root', get_raw_theme_root($template, true));
         update_option('stylesheet_root', get_raw_theme_root($stylesheet, true));
     }
+
     delete_option('current_theme');
     $theme = get_current_theme();
+
     if ( is_admin() && false === get_option( "theme_mods_$stylesheet" ) ) {
         $default_theme_mods = (array) get_option( "mods_$theme" );
         add_option( "theme_mods_$stylesheet", $default_theme_mods );
     }
-    do_action('switch_theme', $theme);
+
+    update_option( 'theme_switched', $old_theme );
+    do_action( 'switch_theme', $theme );
 }