Ticket #21685: 21685-sidebars.diff

wp-content/themes/twentytwelve/functions.php

@@ -368 +368 @@
 function twentytwelve_body_class( $classes ) {
         $background_color = get_background_color();
 
-        if ( ! is_active_sidebar( 'sidebar-1' ) || is_page_template( 'full-width-page.php' ) )
+        if ( ! is_active_sidebar( 1 ) || is_page_template( 'full-width-page.php' ) )
                 $classes[] = 'full-width';
 
         if ( is_page_template( 'homepage.php' ) && has_post_thumbnail() )
@@ -390 +390 @@
  * @since Twenty Twelve 1.0
  */
 function twentytwelve_content_width() {
-        if ( is_page_template( 'full-width-page.php' ) || is_attachment() || ! is_active_sidebar( 'sidebar-1' ) ) {
+        if ( is_page_template( 'full-width-page.php' ) || is_attachment() || ! is_active_sidebar( 1 ) ) {
                 global $content_width;
                 $content_width = 960;
         }

wp-content/themes/twentytwelve/sidebar.php

@@ -8 +8 @@
  * @subpackage Twenty_Twelve
  * @since Twenty Twelve 1.0
  */
-?>
 
-        <?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>
-                <div id="secondary" class="widget-area" role="complementary">
-                        <?php dynamic_sidebar( 'sidebar-1' ); ?>
-                </div><!-- #secondary .widget-area -->
-        <?php endif; ?>
- No newline at end of file
+if ( is_active_sidebar( 1 ) ) : ?>
+        <div id="secondary" class="widget-area" role="complementary">
+                <?php dynamic_sidebar( 1 ); ?>
+        </div><!-- #secondary .widget-area -->
+<?php endif; ?>

wp-content/themes/twentytwelve/sidebar-home.php

@@ -10 +10 @@
  */
 
 /*
-The homepage widget area is triggered if any of the areas
-have widgets. So let's check that first.
-
-If none of the sidebars have widgets, then let's bail early.
-*/
+ * The homepage widget area is triggered if any of the areas
+ * have widgets. So let's check that first.
+ * 
+ * If none of the sidebars have widgets, then let's bail early.
+ */
 if ( ! is_active_sidebar( 2 ) && ! is_active_sidebar( 3 ) )
         return;
 
@@ -23 +23 @@
 <div id="secondary" <?php twentytwelve_homepage_sidebar_class(); ?> role="complementary">
         <?php if ( is_active_sidebar( 2 ) ) : ?>
         <div class="first home-widgets">
-                <?php dynamic_sidebar( 'sidebar-2' ); ?>
+                <?php dynamic_sidebar( 2 ); ?>
         </div><!-- .first .home-widgets -->
         <?php endif; ?>
 
         <?php if ( is_active_sidebar( 3 ) ) : ?>
         <div class="second home-widgets">
-                <?php dynamic_sidebar( 'sidebar-3' ); ?>
+                <?php dynamic_sidebar( 3 ); ?>
         </div><!-- .second .home-widgets -->
         <?php endif; ?>
 </div><!-- #secondary .widget-area -->
+ No newline at end of file