Ticket #12806: functions.diff

wp-content/themes/twentyten/functions.php

@@ -60 +60 @@
  * 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.
@@ -73 +73 @@
  *
  * @since 3.0.0
  */
+if (! function_exists('twentyten_setup') ):
 function twentyten_setup() {
 
         // This theme styles the visual editor with editor-style.css to match the theme style.
@@ -166 +167 @@
                 )
         ) );
 }
+endif;
 
 if ( ! function_exists( 'twentyten_admin_header_style' ) ) :
 /**
@@ -430 +432 @@
                 'after_title' => '</h3>',
         ) );
 }
-add_action( 'init', 'twentyten_widgets_init' );
- No newline at end of file
+add_action( 'init', 'twentyten_widgets_init' );