From 0f1636c621d0d24ff49d2863709cb5bd46b3d684 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Mon, 23 Sep 2019 20:59:48 +0000
Subject: [PATCH] Bundled Themes: Make Twenty Twenty the new default theme.

After being imported in [46271], Twenty Twenty can now be set as the default theme in WordPress.

See #48110.
Props desrosj, ocean90.

git-svn-id: https://develop.svn.wordpress.org/trunk@46278 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../includes/class-wp-theme-install-list-table.php     | 10 +++++-----
 src/wp-admin/includes/update-core.php                  |  1 +
 src/wp-admin/includes/upgrade.php                      | 10 ++++++----
 src/wp-admin/nav-menus.php                             |  4 ++--
 src/wp-includes/class-wp-theme.php                     |  1 +
 src/wp-includes/default-constants.php                  |  2 +-
 tests/phpunit/tests/customize/widgets.php              |  2 +-
 tests/phpunit/tests/theme.php                          |  1 +
 8 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-theme-install-list-table.php b/src/wp-admin/includes/class-wp-theme-install-list-table.php
index abf80d2fcc..ed6e12c381 100644
--- a/src/wp-admin/includes/class-wp-theme-install-list-table.php
+++ b/src/wp-admin/includes/class-wp-theme-install-list-table.php
@@ -241,15 +241,15 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 	 * @param object $theme {
 	 *     An object that contains theme data returned by the WordPress.org API.
 	 *
-	 *     @type string $name           Theme name, e.g. 'Twenty Nineteen'.
-	 *     @type string $slug           Theme slug, e.g. 'twentynineteen'.
+	 *     @type string $name           Theme name, e.g. 'Twenty Twenty'.
+	 *     @type string $slug           Theme slug, e.g. 'twentytwenty'.
 	 *     @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://2019.wordpress.net/'.
-	 *     @type string $screenshot_url Screenshot URL, e.g. 'https://wordpress.org/themes/twentynineteen/'.
+	 *     @type string $preview_url    Preview URL, e.g. 'http://2020.wordpress.net/'.
+	 *     @type string $screenshot_url Screenshot URL, e.g. 'https://wordpress.org/themes/twentytwenty/'.
 	 *     @type float  $rating         Rating score.
 	 *     @type int    $num_ratings    The number of ratings.
-	 *     @type string $homepage       Theme homepage, e.g. 'https://wordpress.org/themes/twentynineteen/'.
+	 *     @type string $homepage       Theme homepage, e.g. 'https://wordpress.org/themes/twentytwenty/'.
 	 *     @type string $description    Theme description.
 	 *     @type string $download_link  Theme ZIP download URL.
 	 * }
diff --git a/src/wp-admin/includes/update-core.php b/src/wp-admin/includes/update-core.php
index e0ac9450ef..1cb915f858 100644
--- a/src/wp-admin/includes/update-core.php
+++ b/src/wp-admin/includes/update-core.php
@@ -825,6 +825,7 @@ $_new_bundled_files = array(
 	'themes/twentysixteen/'   => '4.4',
 	'themes/twentyseventeen/' => '4.7',
 	'themes/twentynineteen/'  => '5.0',
+	'themes/twentytwenty/'    => '5.3',
 );
 
 /**
diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php
index 5aa0f12882..5be2754c20 100644
--- a/src/wp-admin/includes/upgrade.php
+++ b/src/wp-admin/includes/upgrade.php
@@ -446,13 +446,15 @@ Commenter avatars come from <a href="https://gravatar.com">Gravatar</a>.'
 			'sidebars_widgets',
 			array(
 				'wp_inactive_widgets' => array(),
-				'sidebar-1'           => array(
+				'footer-one'          => array(
 					0 => 'search-2',
 					1 => 'recent-posts-2',
 					2 => 'recent-comments-2',
-					3 => 'archives-2',
-					4 => 'categories-2',
-					5 => 'meta-2',
+				),
+				'footer-two'          => array(
+					0 => 'archives-2',
+					1 => 'categories-2',
+					2 => 'meta-2',
 				),
 				'array_version'       => 3,
 			)
diff --git a/src/wp-admin/nav-menus.php b/src/wp-admin/nav-menus.php
index 3312a30443..0694ec8b6a 100644
--- a/src/wp-admin/nav-menus.php
+++ b/src/wp-admin/nav-menus.php
@@ -542,8 +542,8 @@ if ( ! $locations_screen ) : // Main tab
 		/* translators: 1: URL to Widgets screen, 2 and 3: The names of the default themes. */
 			__( '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'
+		'Twenty Nineteen',
+		'Twenty Twenty'
 	) . '</p>';
 	$overview .= '<p>' . __( 'From this screen you can:' ) . '</p>';
 	$overview .= '<ul><li>' . __( 'Create, edit, and delete menus' ) . '</li>';
diff --git a/src/wp-includes/class-wp-theme.php b/src/wp-includes/class-wp-theme.php
index 8a1d88e041..fe8dbb142b 100644
--- a/src/wp-includes/class-wp-theme.php
+++ b/src/wp-includes/class-wp-theme.php
@@ -54,6 +54,7 @@ final class WP_Theme implements ArrayAccess {
 		'twentysixteen'   => 'Twenty Sixteen',
 		'twentyseventeen' => 'Twenty Seventeen',
 		'twentynineteen'  => 'Twenty Nineteen',
+		'twentytwenty'    => 'Twenty Twenty',
 	);
 
 	/**
diff --git a/src/wp-includes/default-constants.php b/src/wp-includes/default-constants.php
index 6b55025ae6..0edf7f7468 100644
--- a/src/wp-includes/default-constants.php
+++ b/src/wp-includes/default-constants.php
@@ -404,7 +404,7 @@ function wp_templating_constants() {
 	 * @see WP_Theme::get_core_default_theme()
 	 */
 	if ( ! defined( 'WP_DEFAULT_THEME' ) ) {
-		define( 'WP_DEFAULT_THEME', 'twentynineteen' );
+		define( 'WP_DEFAULT_THEME', 'twentytwenty' );
 	}
 
 }
diff --git a/tests/phpunit/tests/customize/widgets.php b/tests/phpunit/tests/customize/widgets.php
index 967d3d62f0..ee3f3754ef 100644
--- a/tests/phpunit/tests/customize/widgets.php
+++ b/tests/phpunit/tests/customize/widgets.php
@@ -32,7 +32,7 @@ class Tests_WP_Customize_Widgets extends WP_UnitTestCase {
 
 		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' ), array_keys( 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['sidebar-1'] );
 		$this->assertContains( 'categories-2', $sidebars_widgets['sidebar-1'] );
 		$this->assertArrayHasKey( 2, get_option( 'widget_search' ) );
diff --git a/tests/phpunit/tests/theme.php b/tests/phpunit/tests/theme.php
index cd871a7d28..2f114d43e2 100644
--- a/tests/phpunit/tests/theme.php
+++ b/tests/phpunit/tests/theme.php
@@ -18,6 +18,7 @@ class Tests_Theme extends WP_UnitTestCase {
 		'twentysixteen',
 		'twentyseventeen',
 		'twentynineteen',
+		'twentytwenty',
 	);
 
 	function setUp() {