From 0c8fda014cdc84da1f8d60a71f3c8b6ff19e26e3 Mon Sep 17 00:00:00 2001 From: dd32 Date: Fri, 2 Apr 2010 00:54:48 +0000 Subject: [PATCH] Restore pluggable for twentyten_setup(). Its impossible for child themes to override without using a callback to remove the filter at a higher priority. Props jorbin. Fixes #12806 git-svn-id: http://svn.automattic.com/wordpress/trunk@13923 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-content/themes/twentyten/functions.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wp-content/themes/twentyten/functions.php b/wp-content/themes/twentyten/functions.php index bb42b3c667..d65b85f457 100644 --- a/wp-content/themes/twentyten/functions.php +++ b/wp-content/themes/twentyten/functions.php @@ -53,6 +53,7 @@ if ( ! isset( $content_width ) ) /** Tell WordPress to run twentyten_setup() when the 'after_setup_theme' hook is run. */ add_action( 'after_setup_theme', 'twentyten_setup' ); +if ( ! function_exists('twentyten_setup') ): /** * Sets up theme defaults and registers support for various WordPress features. * @@ -60,8 +61,8 @@ add_action( 'after_setup_theme', 'twentyten_setup' ); * before the init hook. The init hook is too late for some features, such as indicating * support post thumbnails. * - * To override twentyten_setup() in a child theme, remove the action hook and add your own - * function tied to the after_setup_theme hook. + * To override twentyten_setup() in a child theme, add your own twentyten_setup to your child theme's + * functions.php file. * * @uses add_theme_support() To add support for post thumbnails, navigation menus, and automatic feed links. * @uses add_custom_background() To add support for a custom background. @@ -166,6 +167,7 @@ function twentyten_setup() { ) ) ); } +endif; if ( ! function_exists( 'twentyten_admin_header_style' ) ) : /**