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 492e24ba13..475056d8ec 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 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. * } diff --git a/src/wp-admin/includes/update-core.php b/src/wp-admin/includes/update-core.php index e1f81d555b..b04840c43a 100644 --- a/src/wp-admin/includes/update-core.php +++ b/src/wp-admin/includes/update-core.php @@ -816,6 +816,7 @@ $_new_bundled_files = array( 'themes/twentyfifteen/' => '4.1', 'themes/twentysixteen/' => '4.4', 'themes/twentyseventeen/' => '4.7', + 'themes/twentynineteen/' => '5.0', ); /** diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php index 82a6530e2c..af9d65626e 100644 --- a/src/wp-admin/includes/upgrade.php +++ b/src/wp-admin/includes/upgrade.php @@ -434,8 +434,6 @@ As a new WordPress user, you should go to your dashboard to d 4 => 'categories-2', 5 => 'meta-2', ), - 'sidebar-2' => array(), - 'sidebar-3' => array(), 'array_version' => 3, ) ); diff --git a/src/wp-admin/nav-menus.php b/src/wp-admin/nav-menus.php index 14652cb9de..09de783086 100644 --- a/src/wp-admin/nav-menus.php +++ b/src/wp-admin/nav-menus.php @@ -535,7 +535,7 @@ if ( ! current_theme_supports( 'menus' ) && ! $num_locations ) { if ( ! $locations_screen ) : // Main tab $overview = '

' . __( 'This screen is used for managing your navigation menus.' ) . '

'; /* translators: 1: Widgets admin screen URL, 2 and 3: The name of the default themes */ - $overview .= '

' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a “Navigation Menu” widget on the Widgets 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' ) . '

'; + $overview .= '

' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a “Navigation Menu” widget on the Widgets 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' ) . '

'; $overview .= '

' . __( 'From this screen you can:' ) . '

'; $overview .= ''; diff --git a/src/wp-includes/class-wp-theme.php b/src/wp-includes/class-wp-theme.php index ea5cb4e00e..a9ddb2251a 100644 --- a/src/wp-includes/class-wp-theme.php +++ b/src/wp-includes/class-wp-theme.php @@ -53,6 +53,7 @@ final class WP_Theme implements ArrayAccess { 'twentyfifteen' => 'Twenty Fifteen', 'twentysixteen' => 'Twenty Sixteen', 'twentyseventeen' => 'Twenty Seventeen', + 'twentynineteen' => 'Twenty Nineteen', ); /** diff --git a/src/wp-includes/default-constants.php b/src/wp-includes/default-constants.php index dfa3129b84..1d3fd5df98 100644 --- a/src/wp-includes/default-constants.php +++ b/src/wp-includes/default-constants.php @@ -392,7 +392,7 @@ function wp_templating_constants() { * @see WP_Theme::get_core_default_theme() */ if ( ! defined( 'WP_DEFAULT_THEME' ) ) { - define( 'WP_DEFAULT_THEME', 'twentyseventeen' ); + define( 'WP_DEFAULT_THEME', 'twentynineteen' ); } } diff --git a/tests/phpunit/tests/customize/widgets.php b/tests/phpunit/tests/customize/widgets.php index bbc8819085..967d3d62f0 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', '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'] ); $this->assertArrayHasKey( 2, get_option( 'widget_search' ) ); diff --git a/tests/phpunit/tests/theme.php b/tests/phpunit/tests/theme.php index 5ccc350e5a..7e2ea89efc 100644 --- a/tests/phpunit/tests/theme.php +++ b/tests/phpunit/tests/theme.php @@ -17,6 +17,7 @@ class Tests_Theme extends WP_UnitTestCase { 'twentyfifteen', 'twentysixteen', 'twentyseventeen', + 'twentynineteen', ); function setUp() {