Changeset 20330

Timestamp:

03/30/2012 03:13:12 PM (14 years ago)

Author:

westi

Message:

Avoid fatal errors in check_theme_switched() if we fail to get a WP_Theme object for the old theme. Fixes #20334.

File:

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

trunk/wp-includes/theme.php

@@ -1556 +1556 @@
         if ( $stylesheet = get_option( 'theme_switched' ) ) {
                 $old_theme = wp_get_theme( $stylesheet );
-                do_action( 'after_switch_theme', $old_theme->get('Name'), $old_theme );
+
+                // If we can't find the old theme then fallback to passing the raw data to the action like we did pre-3.4
+                if ( $old_theme )
+                        do_action( 'after_switch_theme', $old_theme->get('Name'), $old_theme );
+                else
+                        do_action( 'after_switch_theme', $stylesheet );
+
                 update_option( 'theme_switched', false );
         }