Changeset 43954

Timestamp:

11/30/2018 08:24:42 PM (8 years ago)

Author:

mcsf

Message:

Update sidebars_widgets to match Twenty Nineteen's single widget area

• Also update the customizer tests to match it.

Props SergeyBiryukov, pento.

Location:

branches/5.0

Files:

• src/wp-admin/includes/class-wp-theme-install-list-table.php (modified) (1 diff)
• src/wp-admin/includes/upgrade.php (modified) (1 diff)
• src/wp-admin/nav-menus.php (modified) (1 diff)
• tests/phpunit/tests/customize/widgets.php (modified) (1 diff)

branches/5.0/src/wp-admin/includes/class-wp-theme-install-list-table.php

@@ -231 +231 @@
          *     An object that contains theme data returned by the WordPress.org API.
          *
-         *     @type string $name           Theme name, e.g. 'Twenty Seventeen'.
-         *     @type string $slug           Theme slug, e.g. 'twentyseventeen'.
+         *     @type string $name           Theme name, e.g. 'Twenty Nineteen'.
+         *     @type string $slug           Theme slug, e.g. 'twentynineteen'.
          *     @type string $version        Theme version, e.g. '1.1'.
          *     @type string $author         Theme author username, e.g. 'melchoyce'.
-         *     @type string $preview_url    Preview URL, e.g. 'http://2017.wordpress.net/'.
-         *     @type string $screenshot_url Screenshot URL, e.g. 'https://wordpress.org/themes/twentyseventeen/'.
+         *     @type string $preview_url    Preview URL, e.g. 'http://2019.wordpress.net/'.
+         *     @type string $screenshot_url Screenshot URL, e.g. 'https://wordpress.org/themes/twentynineteen/'.
          *     @type float  $rating         Rating score.
          *     @type int    $num_ratings    The number of ratings.
-         *     @type string $homepage       Theme homepage, e.g. 'https://wordpress.org/themes/twentyseventeen/'.
+         *     @type string $homepage       Theme homepage, e.g. 'https://wordpress.org/themes/twentynineteen/'.
          *     @type string $description    Theme description.
          *     @type string $download_link  Theme ZIP download URL.

branches/5.0/src/wp-admin/includes/upgrade.php

@@ -331 +331 @@
         update_option( 'widget_categories', array ( 2 => array ( 'title' => '', 'count' => 0, 'hierarchical' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) );
         update_option( 'widget_meta', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
-        update_option( 'sidebars_widgets', array( 'wp_inactive_widgets' => array(), 'sidebar-1' => array( 0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2' ), 'sidebar-2' => array(), 'sidebar-3' => array(), 'array_version' => 3 ) );
+        update_option( 'sidebars_widgets', array( 'wp_inactive_widgets' => array(), 'sidebar-1' => array( 0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2' ), 'array_version' => 3 ) );
         if ( ! is_multisite() )
                 update_user_meta( $user_id, 'show_welcome_panel', 1 );

branches/5.0/src/wp-admin/nav-menus.php

@@ -520 +520 @@
         $overview  = '<p>' . __( 'This screen is used for managing your navigation menus.' ) . '</p>';
         /* translators: 1: Widgets admin screen URL, 2 and 3: The name of the default themes */
-        $overview .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a &#8220;Navigation Menu&#8221; widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the navigation menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side.' ), admin_url( 'widgets.php' ), 'Twenty Sixteen', 'Twenty Seventeen' ) . '</p>';
+        $overview .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a &#8220;Navigation Menu&#8221; widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the navigation menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side.' ), admin_url( 'widgets.php' ), 'Twenty Seventeen', 'Twenty Nineteen' ) . '</p>';
         $overview .= '<p>' . __( 'From this screen you can:' ) . '</p>';
         $overview .= '<ul><li>' . __( 'Create, edit, and delete menus' ) . '</li>';

branches/5.0/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', 'sidebar-1', 'sidebar-2', 'sidebar-3' ), array_keys( wp_get_sidebars_widgets() ) );
+                $this->assertEqualSets( array( 'wp_inactive_widgets', 'sidebar-1' ), array_keys( wp_get_sidebars_widgets() ) );
                 $this->assertContains( 'search-2', $sidebars_widgets['sidebar-1'] );
                 $this->assertContains( 'categories-2', $sidebars_widgets['sidebar-1'] );