Changeset 46283

Timestamp:

09/23/2019 11:16:59 PM (5 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

Files:

• src/wp-admin/includes/upgrade.php (modified) (1 diff)
• src/wp-content/themes/twentytwenty/footer.php (modified) (2 diffs)
• src/wp-content/themes/twentytwenty/functions.php (modified) (2 diffs)
• src/wp-content/themes/twentytwenty/inc/starter-content.php (modified) (1 diff)
• tests/phpunit/tests/customize/manager.php (modified) (3 diffs)
• tests/phpunit/tests/customize/widgets.php (modified) (4 diffs)

trunk/src/wp-admin/includes/upgrade.php

@@ -447 +447 @@
             array(
                 'wp_inactive_widgets' => array(),
-                'footer-one'          => array(
+                'sidebar-1'          => array(
                     0 => 'search-2',
                     1 => 'recent-posts-2',
                     2 => 'recent-comments-2',
                 ),
-                'footer-two'          => array(
+                'sidebar-2'          => array(
                     0 => 'archives-2',
                     1 => 'categories-2',

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',
             ),

trunk/tests/phpunit/tests/customize/manager.php

@@ -1778 +1778 @@
         $old_sidebars_widgets = get_option( 'sidebars_widgets' );
         $new_sidebars_widgets = $old_sidebars_widgets;
-        $this->assertGreaterThan( 2, count( $new_sidebars_widgets['footer-one'] ) );
-        $new_sidebar_1 = array_reverse( $new_sidebars_widgets['footer-one'] );
+        $this->assertGreaterThan( 2, count( $new_sidebars_widgets['sidebar-1'] ) );
+        $new_sidebar_1 = array_reverse( $new_sidebars_widgets['sidebar-1'] );
 
         $post_id = $this->factory()->post->create(
@@ -1788 +1788 @@
                 'post_content' => wp_json_encode(
                     array(
-                        'sidebars_widgets[footer-one]' => array(
+                        'sidebars_widgets[sidebar-1]' => array(
                             'value' => $new_sidebar_1,
                         ),
@@ -1805 +1805 @@
         // Ensure that the value has actually been written to the DB.
         $updated_sidebars_widgets = get_option( 'sidebars_widgets' );
-        $this->assertEquals( $new_sidebar_1, $updated_sidebars_widgets['footer-one'] );
+        $this->assertEquals( $new_sidebar_1, $updated_sidebars_widgets['sidebar-1'] );
     }
 

trunk/tests/phpunit/tests/customize/widgets.php

@@ -33 +33 @@
         unset( $GLOBALS['_wp_sidebars_widgets'] ); // clear out cache set by wp_get_sidebars_widgets()
         $sidebars_widgets = wp_get_sidebars_widgets();
-        $this->assertEqualSets( array( 'wp_inactive_widgets', 'footer-one', 'footer-two' ), array_keys( wp_get_sidebars_widgets() ) );
-        $this->assertContains( 'search-2', $sidebars_widgets['footer-one'] );
-        $this->assertContains( 'categories-2', $sidebars_widgets['footer-two'] );
+        $this->assertEqualSets( array( 'wp_inactive_widgets', 'sidebar-1', 'sidebar-2' ), array_keys( wp_get_sidebars_widgets() ) );
+        $this->assertContains( 'search-2', $sidebars_widgets['sidebar-1'] );
+        $this->assertContains( 'categories-2', $sidebars_widgets['sidebar-2'] );
         $this->assertArrayHasKey( 2, get_option( 'widget_search' ) );
         $widget_categories = get_option( 'widget_categories' );
@@ -102 +102 @@
      */
     function test_customize_register_with_deleted_sidebars() {
-        $sidebar_id = 'footer-one';
+        $sidebar_id = 'sidebar-1';
         delete_option( 'sidebars_widgets' );
         register_sidebar( array( 'id' => $sidebar_id ) );
@@ -312 +312 @@
             'sanitize_js_callback' => array( $this->manager->widgets, 'sanitize_sidebar_widgets_js_instance' ),
         );
-        $args         = $this->manager->widgets->get_setting_args( 'sidebars_widgets[footer-one]' );
+        $args         = $this->manager->widgets->get_setting_args( 'sidebars_widgets[sidebar-1]' );
         foreach ( $default_args as $key => $default_value ) {
             $this->assertEquals( $default_value, $args[ $key ] );
         }
-        $this->assertEquals( 'SIDEBARS_WIDGETS[FOOTER-ONE]', $args['uppercase_id_set_by_filter'] );
+        $this->assertEquals( 'SIDEBARS_WIDGETS[SIDEBAR-1]', $args['uppercase_id_set_by_filter'] );
 
         $override_args = array(
@@ -654 +654 @@
         $this->assertFalse( $this->manager->widgets->render_widget_partial( $partial, array( 'sidebar_id' => 'non-existing' ) ) );
 
-        $output = $this->manager->widgets->render_widget_partial( $partial, array( 'sidebar_id' => 'footer-one' ) );
+        $output = $this->manager->widgets->render_widget_partial( $partial, array( 'sidebar_id' => 'sidebar-1' ) );
 
         $this->assertEquals( 1, substr_count( $output, 'data-customize-partial-id' ) );