Changeset 46283 for trunk/src/wp-content/themes/twentytwenty

Timestamp:

09/23/2019 11:16:59 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Twenty Twenty: Rename widget areas to sidebar-1 and sidebar-2.

This ensures that widgets are mapped correctly and is consistent with the previous default themes.

See ​https://github.com/WordPress/twentytwenty/issues/481.

Reverts [46282].

Props ocean90, garrett-eclipse, desrosj, SergeyBiryukov.
See #48110.

Location:

trunk/src/wp-content/themes/twentytwenty

Files:

• footer.php (modified) (2 diffs)
• functions.php (modified) (2 diffs)
• inc/starter-content.php (modified) (1 diff)

trunk/src/wp-content/themes/twentytwenty/footer.php

@@ -90 +90 @@
 
 
-                <?php if ( is_active_sidebar( 'footer-one' ) || is_active_sidebar( 'footer-two' ) ) { ?>
+                <?php if ( is_active_sidebar( 'sidebar-1' ) || is_active_sidebar( 'sidebar-2' ) ) { ?>
 
                     <div class="footer-widgets-outer-wrapper">
@@ -96 +96 @@
                         <div class="footer-widgets-wrapper">
 
-                            <?php if ( is_active_sidebar( 'footer-one' ) ) { ?>
+                            <?php if ( is_active_sidebar( 'sidebar-1' ) ) { ?>
 
                                 <div class="footer-widgets column-one grid-item">
-                                    <?php dynamic_sidebar( 'footer-one' ); ?>
+                                    <?php dynamic_sidebar( 'sidebar-1' ); ?>
                                 </div>
 
                             <?php } ?>
 
-                            <?php if ( is_active_sidebar( 'footer-two' ) ) { ?>
+                            <?php if ( is_active_sidebar( 'sidebar-2' ) ) { ?>
 
                                 <div class="footer-widgets column-two grid-item">
-                                    <?php dynamic_sidebar( 'footer-two' ); ?>
+                                    <?php dynamic_sidebar( 'sidebar-2' ); ?>
                                 </div>
 

trunk/src/wp-content/themes/twentytwenty/functions.php

@@ -335 +335 @@
                 array(
                     'name'        => __( 'Footer #1', 'twentytwenty' ),
-                    'id'          => 'footer-one',
+                    'id'          => 'sidebar-1',
                     'description' => __( 'Widgets in this area will be displayed in the first column in the footer.', 'twentytwenty' ),
                 )
@@ -347 +347 @@
                 array(
                     'name'        => __( 'Footer #2', 'twentytwenty' ),
-                    'id'          => 'footer-two',
+                    'id'          => 'sidebar-2',
                     'description' => __( 'Widgets in this area will be displayed in the second column in the footer.', 'twentytwenty' ),
                 )

trunk/src/wp-content/themes/twentytwenty/inc/starter-content.php

@@ -24 +24 @@
         'widgets'   => array(
             // Place one core-defined widgets in the first tooter widget area.
-            'footer-one' => array(
+            'sidebar-1' => array(
                 'text_about',
             ),
             // Place one core-defined widgets in the second tooter widget area.
-            'footer-two' => array(
+            'sidebar-2' => array(
                 'text_business_info',
             ),