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

Rename the newly added action 'after_theme_change' to 'after_switch_theme' so it matches the 'switch_theme' action, props scribu, see #17979 

git-svn-id: http://svn.automattic.com/wordpress/trunk@18656 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2011-09-08 20:59:41 +00:00
parent c00346820f
commit dc936c54c1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/default-filters.php
View File

@ -219,7 +219,7 @@ add_action( 'wp_head', 'wp_shortlink_wp_head', 10, 0 );
add_action( 'template_redirect', 'wp_shortlink_header', 11, 0 ); add_action( 'template_redirect', 'wp_shortlink_header', 11, 0 );
add_action( 'wp_print_footer_scripts', '_wp_footer_scripts' ); add_action( 'wp_print_footer_scripts', '_wp_footer_scripts' );
add_action( 'init', 'check_theme_switched', 99 ); add_action( 'init', 'check_theme_switched', 99 );
add_action( 'after_theme_change', '_wp_sidebars_changed' ); add_action( 'after_switch_theme', '_wp_sidebars_changed' );
if ( isset( $_GET['replytocom'] ) ) if ( isset( $_GET['replytocom'] ) )
add_filter( 'pre_option_blog_public', '__return_zero' ); add_filter( 'pre_option_blog_public', '__return_zero' );

4
wp-includes/theme.php
View File

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