Changeset 21643

Timestamp:

08/28/2012 05:16:18 PM (14 years ago)

Author:

lancewillett

Message:

Twenty Twelve: use sidebar ID string value for sidebar checks instead of hard-coded integer, props nacin. See #21685.

Location:

trunk/wp-content/themes/twentytwelve

Files:

• functions.php (modified) (3 diffs)
• sidebar-home.php (modified) (2 diffs)
• sidebar.php (modified) (1 diff)

trunk/wp-content/themes/twentytwelve/functions.php

@@ -212 +212 @@
         $classes = array( 'widget-area' );
 
-        if ( is_active_sidebar( 2 ) && is_active_sidebar( 3 ) )
+        if ( is_active_sidebar( 'sidebar-2' ) && is_active_sidebar( 'sidebar-3' ) )
                 $classes[] = 'two';
 
@@ -363 +363 @@
         $background_color = get_background_color();
 
-        if ( ! is_active_sidebar( 1 ) || is_page_template( 'page-templates/full-width.php' ) )
+        if ( ! is_active_sidebar( 'sidebar-1' ) || is_page_template( 'page-templates/full-width.php' ) )
                 $classes[] = 'full-width';
 
@@ -388 +388 @@
  */
 function twentytwelve_content_width() {
-        if ( is_page_template( 'page-templates/full-width.php' ) || is_attachment() || ! is_active_sidebar( 1 ) ) {
+        if ( is_page_template( 'page-templates/full-width.php' ) || is_attachment() || ! is_active_sidebar( 'sidebar-1' ) ) {
                 global $content_width;
                 $content_width = 960;

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

@@ -16 +16 @@
  * If none of the sidebars have widgets, then let's bail early.
  */
-if ( ! is_active_sidebar( 2 ) && ! is_active_sidebar( 3 ) )
+if ( ! is_active_sidebar( 'sidebar-2' ) && ! is_active_sidebar( 'sidebar-3' ) )
         return;
 
@@ -22 +22 @@
 ?>
 <div id="secondary" <?php twentytwelve_homepage_sidebar_class(); ?> role="complementary">
-        <?php if ( is_active_sidebar( 2 ) ) : ?>
+        <?php if ( is_active_sidebar( 'sidebar-2' ) ) : ?>
         <div class="first home-widgets">
-                <?php dynamic_sidebar( 2 ); ?>
+                <?php dynamic_sidebar( 'sidebar-2' ); ?>
         </div><!-- .first -->
         <?php endif; ?>
 
-        <?php if ( is_active_sidebar( 3 ) ) : ?>
+        <?php if ( is_active_sidebar( 'sidebar-3' ) ) : ?>
         <div class="second home-widgets">
-                <?php dynamic_sidebar( 3 ); ?>
+                <?php dynamic_sidebar( 'sidebar-3' ); ?>
         </div><!-- .second -->
         <?php endif; ?>

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

@@ -11 +11 @@
 ?>
 
-        <?php if ( is_active_sidebar( 1 ) ) : ?>
+        <?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>
                 <div id="secondary" class="widget-area" role="complementary">
-                        <?php dynamic_sidebar( 1 ); ?>
+                        <?php dynamic_sidebar( 'sidebar-1' ); ?>
                 </div><!-- #secondary -->
         <?php endif; ?>