Changeset 18655

Timestamp:

09/08/2011 08:07:15 PM (12 years ago)

Author:

azaozz

Message:

Make check_theme_switched() run an action so this enhancement is available to plugins and themes too, see #17979

Location:

trunk/wp-includes

Files:

• default-filters.php (modified) (1 diff)
• theme.php (modified) (1 diff)
• widgets.php (modified) (1 diff)

trunk/wp-includes/default-filters.php

@@ -220 +220 @@
 add_action( 'wp_print_footer_scripts', '_wp_footer_scripts'                 );
 add_action( 'init',                'check_theme_switched',            99    );
+add_action( 'after_theme_change',  '_wp_sidebars_changed'                   );
 
 if ( isset( $_GET['replytocom'] ) )

trunk/wp-includes/theme.php

@@ -1994 +1994 @@
 add_action( 'delete_attachment', '_delete_attachment_theme_mod' );
 
-?>
+/**
+ * Checks if a theme has been changed and runs 'after_theme_change' hook on the next WP load
+ *
+ * @since 3.3
+ */   
+function check_theme_switched() {
+    if ( false !== ( $old_theme = get_option( 'theme_switched' ) ) && !empty( $old_theme ) ) {
+        do_action( 'after_theme_change', $old_theme );      
+        update_option( 'theme_switched', false );
+    }
+}

trunk/wp-includes/widgets.php

@@ -1195 +1195 @@
 }
 
-function check_theme_switched() {
-    if ( false !== ( $old_theme = get_option( 'theme_switched' ) ) && !empty( $old_theme ) ) {
-        global $sidebars_widgets;
-
-        if ( ! is_array( $sidebars_widgets ) )
-            $sidebars_widgets = wp_get_sidebars_widgets();
-
-        retrieve_widgets();
-        update_option( 'theme_switched', false );
-    }
+/**
+ * Handle sidebars config after theme change
+ *
+ * @access private
+ * @since 3.3
+ */  
+function _wp_sidebars_changed() {
+    global $sidebars_widgets;
+
+    if ( ! is_array( $sidebars_widgets ) )
+        $sidebars_widgets = wp_get_sidebars_widgets();
+
+    retrieve_widgets();
 }