Ticket #17032: widget.diff

Index: trunk/wp-content/themes/twentyten/functions.php
===================================================================
--- a/trunk/wp-content/themes/twentyten/functions.php
+++ b/trunk/wp-content/themes/twentyten/functions.php
@@ -364,4 +364,82 @@
- /**
- * Register widgetized areas, including two sidebars and four widget-ready columns in the footer.
- *
- * To override twentyten_widgets_init() in a child theme, remove the action hook and add your own
- * function tied to the init hook.
- *
- * @since Twenty Ten 1.0
- * @uses register_sidebar
- */
- function twentyten_widgets_init() {
        // Area 1, located at the top of the sidebar.
        register_sidebar( array(
                'name' => __( 'Primary Widget Area', 'twentyten' ),
                'id' => 'primary-widget-area',
                'description' => __( 'The primary widget area', 'twentyten' ),
                'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
                'after_widget' => '</li>',
                'before_title' => '<h3 class="widget-title">',
                'after_title' => '</h3>',
        ) );

        // Area 2, located below the Primary Widget Area in the sidebar. Empty by default.
        register_sidebar( array(
                'name' => __( 'Secondary Widget Area', 'twentyten' ),
                'id' => 'secondary-widget-area',
                'description' => __( 'The secondary widget area', 'twentyten' ),
                'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
                'after_widget' => '</li>',
                'before_title' => '<h3 class="widget-title">',
                'after_title' => '</h3>',
        ) );

-       // Area 3, located in the footer. Empty by default.
        register_sidebar( array(
                'name' => __( 'First Footer Widget Area', 'twentyten' ),
                'id' => 'first-footer-widget-area',
                'description' => __( 'The first footer widget area', 'twentyten' ),
                'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
                'after_widget' => '</li>',
                'before_title' => '<h3 class="widget-title">',
                'after_title' => '</h3>',
        ) );

-       // Area 4, located in the footer. Empty by default.
        register_sidebar( array(
                'name' => __( 'Second Footer Widget Area', 'twentyten' ),
                'id' => 'second-footer-widget-area',
                'description' => __( 'The second footer widget area', 'twentyten' ),
                'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
                'after_widget' => '</li>',
                'before_title' => '<h3 class="widget-title">',
                'after_title' => '</h3>',
        ) );

-       // Area 5, located in the footer. Empty by default.
        register_sidebar( array(
                'name' => __( 'Third Footer Widget Area', 'twentyten' ),
                'id' => 'third-footer-widget-area',
                'description' => __( 'The third footer widget area', 'twentyten' ),
                'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
                'after_widget' => '</li>',
                'before_title' => '<h3 class="widget-title">',
                'after_title' => '</h3>',
        ) );

-       // Area 6, located in the footer. Empty by default.
        register_sidebar( array(
                'name' => __( 'Fourth Footer Widget Area', 'twentyten' ),
                'id' => 'fourth-footer-widget-area',
                'description' => __( 'The fourth footer widget area', 'twentyten' ),
                'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
                'after_widget' => '</li>',
                'before_title' => '<h3 class="widget-title">',
                'after_title' => '</h3>',
        ) );
}
-/** Register sidebars by running twentyten_widgets_init() on the widgets_init hook. */
-add_action( 'widgets_init', 'twentyten_widgets_init' );

+ /**
+  * Register widgetized areas, including two sidebars.
+  * @uses register_sidebar
+  */
+ function twentyten_sidebar_widgets_init() {
        // Area 1, located at the top of the sidebar.
        register_sidebar( array(
                'name' => __( 'Primary Widget Area', 'twentyten' ),
                'id' => 'primary-widget-area',
                'description' => __( 'The primary widget area', 'twentyten' ),
                'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
                'after_widget' => '</li>',
                'before_title' => '<h3 class="widget-title">',
                'after_title' => '</h3>',
        ) );
 
        // Area 2, located below the Primary Widget Area in the sidebar. Empty by default.
        register_sidebar( array(
                'name' => __( 'Secondary Widget Area', 'twentyten' ),
                'id' => 'secondary-widget-area',
                'description' => __( 'The secondary widget area', 'twentyten' ),
                'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
                'after_widget' => '</li>',
                'before_title' => '<h3 class="widget-title">',
                'after_title' => '</h3>',
        ) );
+ /** Register sidebars by running twentyten_sidebar_widgets_init() on the widgets_init hook. */
+ add_action( 'widgets_init', 'twentyten_sidebar_widgets_init' );

+ /**
+  * Register widgetized areas, including four widget-ready columns in the footer.
+  * @uses register_sidebar
+  */   
+ function twentyten_footer_widgets_init() {
+       // Area 1, located in the footer. Empty by default.
        register_sidebar( array(
                'name' => __( 'First Footer Widget Area', 'twentyten' ),
                'id' => 'first-footer-widget-area',
                'description' => __( 'The first footer widget area', 'twentyten' ),
                'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
                'after_widget' => '</li>',
                'before_title' => '<h3 class="widget-title">',
                'after_title' => '</h3>',
        ) );
 
+       // Area 2, located in the footer. Empty by default.
        register_sidebar( array(
                'name' => __( 'Second Footer Widget Area', 'twentyten' ),
                'id' => 'second-footer-widget-area',
                'description' => __( 'The second footer widget area', 'twentyten' ),
                'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
                'after_widget' => '</li>',
                'before_title' => '<h3 class="widget-title">',
                'after_title' => '</h3>',
        ) );
 
+       // Area 3, located in the footer. Empty by default.
        register_sidebar( array(
                'name' => __( 'Third Footer Widget Area', 'twentyten' ),
                'id' => 'third-footer-widget-area',
                'description' => __( 'The third footer widget area', 'twentyten' ),
                'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
                'after_widget' => '</li>',
                'before_title' => '<h3 class="widget-title">',
                'after_title' => '</h3>',
        ) );
 
+       // Area 4, located in the footer. Empty by default.
        register_sidebar( array(
                'name' => __( 'Fourth Footer Widget Area', 'twentyten' ),
                'id' => 'fourth-footer-widget-area',
                'description' => __( 'The fourth footer widget area', 'twentyten' ),
                'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
                'after_widget' => '</li>',
                'before_title' => '<h3 class="widget-title">',
                'after_title' => '</h3>',
        ) );
}
+ /** Register sidebars by running twentyten_footer_widgets_init() on the widgets_init hook. */
+ add_action( 'widgets_init', 'twentyten_footer_widgets_init' );