From 75ca24955880b006ae1d657e603ef287fe5b3939 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 23 Sep 2019 23:17:58 +0000
Subject: [PATCH] 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.
Built from https://develop.svn.wordpress.org/trunk@46283


git-svn-id: http://core.svn.wordpress.org/trunk@46095 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/upgrade.php                          |  4 ++--
 wp-content/themes/twentytwenty/footer.php              | 10 +++++-----
 wp-content/themes/twentytwenty/functions.php           |  4 ++--
 wp-content/themes/twentytwenty/inc/starter-content.php |  4 ++--
 wp-includes/version.php                                |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 5be2754c20..e1a8794a6c 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -446,12 +446,12 @@ Commenter avatars come from <a href="https://gravatar.com">Gravatar</a>.'
 			'sidebars_widgets',
 			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',
 					2 => 'meta-2',
diff --git a/wp-content/themes/twentytwenty/footer.php b/wp-content/themes/twentytwenty/footer.php
index e0c27e5c29..614a278ea4 100644
--- a/wp-content/themes/twentytwenty/footer.php
+++ b/wp-content/themes/twentytwenty/footer.php
@@ -89,24 +89,24 @@
 				<?php } ?>
 
 
-				<?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">
 
 						<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>
 
 							<?php } ?>
diff --git a/wp-content/themes/twentytwenty/functions.php b/wp-content/themes/twentytwenty/functions.php
index 5a45509f23..0cf2c1137c 100644
--- a/wp-content/themes/twentytwenty/functions.php
+++ b/wp-content/themes/twentytwenty/functions.php
@@ -334,7 +334,7 @@ if ( ! function_exists( 'twentytwenty_sidebar_registration' ) ) {
 				$shared_args,
 				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' ),
 				)
 			)
@@ -346,7 +346,7 @@ if ( ! function_exists( 'twentytwenty_sidebar_registration' ) ) {
 				$shared_args,
 				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' ),
 				)
 			)
diff --git a/wp-content/themes/twentytwenty/inc/starter-content.php b/wp-content/themes/twentytwenty/inc/starter-content.php
index 58fcd151f4..d071724bfc 100644
--- a/wp-content/themes/twentytwenty/inc/starter-content.php
+++ b/wp-content/themes/twentytwenty/inc/starter-content.php
@@ -23,11 +23,11 @@ function twentytwenty_get_starter_content() {
 	$starter_content = array(
 		'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',
 			),
 		),
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 473b5e923a..f985f0575c 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.3-alpha-46282';
+$wp_version = '5.3-alpha-46283';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.