From 9ed7cba3e7e88c8c8680948aa7e5c7fb98542462 Mon Sep 17 00:00:00 2001 From: dd32 Date: Fri, 19 Feb 2010 10:00:00 +0000 Subject: [PATCH] Rename the new 'themes_loaded' hook to 'after_setup_theme' to prevent confusion as to what it actually does & where its fired from. Fixes #12231 git-svn-id: http://svn.automattic.com/wordpress/trunk@13214 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-content/themes/twentyten/functions.php | 2 +- wp-settings.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-content/themes/twentyten/functions.php b/wp-content/themes/twentyten/functions.php index 9a23cceaa3..7fcf506206 100644 --- a/wp-content/themes/twentyten/functions.php +++ b/wp-content/themes/twentyten/functions.php @@ -39,7 +39,7 @@ function twentyten_init() { require_once( $locale_file ); } endif; -add_action( 'themes_loaded', 'twentyten_init' ); +add_action( 'after_setup_theme', 'twentyten_init' ); if ( ! function_exists( 'twentyten_admin_header_style' ) ) : function twentyten_admin_header_style() { diff --git a/wp-settings.php b/wp-settings.php index 71b999eb59..136acd10b2 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -265,7 +265,7 @@ if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/function if ( file_exists( TEMPLATEPATH . '/functions.php' ) ) include( TEMPLATEPATH . '/functions.php' ); -do_action( 'themes_loaded' ); +do_action( 'after_setup_theme' ); // Load any template functions the theme supports. require_if_theme_supports( 'post-thumbnails', ABSPATH . WPINC . '/post-thumbnail-template.php' );