WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update `sidebars_widgets` to match Twenty Nineteen's single widget area 

* Also update the customizer tests to match it.

Props SergeyBiryukov, pento.


Built from https://develop.svn.wordpress.org/branches/5.0@43954


git-svn-id: http://core.svn.wordpress.org/branches/5.0@43786 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
mcsf 2018-11-30 20:25:46 +00:00
parent fa65b25ac7
commit 73b656936c
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-admin/includes/class-wp-theme-install-list-table.php
View File

@ -230,15 +230,15 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
* @param object $theme { * @param object $theme {
* An object that contains theme data returned by the WordPress.org API. * An object that contains theme data returned by the WordPress.org API.
* *
* @type string $name Theme name, e.g. 'Twenty Seventeen'. * @type string $name Theme name, e.g. 'Twenty Nineteen'.
* @type string $slug Theme slug, e.g. 'twentyseventeen'. * @type string $slug Theme slug, e.g. 'twentynineteen'.
* @type string $version Theme version, e.g. '1.1'. * @type string $version Theme version, e.g. '1.1'.
* @type string $author Theme author username, e.g. 'melchoyce'. * @type string $author Theme author username, e.g. 'melchoyce'.
* @type string $preview_url Preview URL, e.g. 'http://2017.wordpress.net/'. * @type string $preview_url Preview URL, e.g. 'http://2019.wordpress.net/'.
* @type string $screenshot_url Screenshot URL, e.g. 'https://wordpress.org/themes/twentyseventeen/'. * @type string $screenshot_url Screenshot URL, e.g. 'https://wordpress.org/themes/twentynineteen/'.
* @type float $rating Rating score. * @type float $rating Rating score.
* @type int $num_ratings The number of ratings. * @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 $description Theme description.
* @type string $download_link Theme ZIP download URL. * @type string $download_link Theme ZIP download URL.
* } * }

2
wp-admin/includes/upgrade.php
View File

@ -330,7 +330,7 @@ Commenter avatars come from <a href="https://gravatar.com">Gravatar</a>.' );
update_option( 'widget_archives', array ( 2 => array ( 'title' => '', 'count' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) ); update_option( 'widget_archives', array ( 2 => array ( 'title' => '', 'count' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) );
update_option( 'widget_categories', array ( 2 => array ( 'title' => '', 'count' => 0, 'hierarchical' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) ); 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( '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() ) if ( ! is_multisite() )
update_user_meta( $user_id, 'show_welcome_panel', 1 ); update_user_meta( $user_id, 'show_welcome_panel', 1 );
elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) ) elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) )

2
wp-admin/nav-menus.php
View File

@ -519,7 +519,7 @@ if ( ! current_theme_supports( 'menus' ) && ! $num_locations )
if ( ! $locations_screen ) : // Main tab if ( ! $locations_screen ) : // Main tab
$overview = '<p>' . __( 'This screen is used for managing your navigation menus.' ) . '</p>'; $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 */ /* 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 .= '<p>' . __( 'From this screen you can:' ) . '</p>';
$overview .= '<ul><li>' . __( 'Create, edit, and delete menus' ) . '</li>'; $overview .= '<ul><li>' . __( 'Create, edit, and delete menus' ) . '</li>';
$overview .= '<li>' . __( 'Add, organize, and modify individual menu items' ) . '</li></ul>'; $overview .= '<li>' . __( 'Add, organize, and modify individual menu items' ) . '</li></ul>';

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.0-RC1-43953'; $wp_version = '5.0-RC1-43954';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.