Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Store stylesheet rather than theme name in the theme_switched option. see #20103. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@20163 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-03-08 21:22:24 +00:00
parent ead3f2f435
commit 69447d2e89
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-includes/theme.php
View File

@ -746,7 +746,7 @@ function switch_theme( $template, $stylesheet ) {
add_option( "theme_mods_$stylesheet", $default_theme_mods );
}
update_option( 'theme_switched', $old_theme->get('Name') );
update_option( 'theme_switched', $old_theme->get_stylesheet() );
do_action( 'switch_theme', $new_name, $new_theme );
}
@ -1564,8 +1564,9 @@ add_action( 'delete_attachment', '_delete_attachment_theme_mod' );
* @since 3.3.0
*/
function check_theme_switched() {
if ( false !== ( $old_theme = get_option( 'theme_switched' ) ) && !empty( $old_theme ) ) {
do_action( 'after_switch_theme', $old_theme );
if ( $stylesheet = get_option( 'theme_switched' ) ) {
$old_theme = wp_get_theme( $stylesheet );
do_action( 'after_switch_theme', $old_theme->get('Name'), $old_theme );
update_option( 'theme_switched', false );
}
}