WordPress.org

Make WordPress Core

Ticket #45152: 45152.5.diff

File 45152.5.diff, 5.7 KB (added by pento, 3 years ago)
  • src/wp-admin/includes/class-wp-theme-install-list-table.php

    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 d02d56b5b8..02ab9c226b 100644
    a b class WP_Theme_Install_List_Table extends WP_Themes_List_Table { 
    230230         * @param object $theme {
    231231         *     An object that contains theme data returned by the WordPress.org API.
    232232         *
    233          *     @type string $name           Theme name, e.g. 'Twenty Seventeen'.
    234          *     @type string $slug           Theme slug, e.g. 'twentyseventeen'.
     233         *     @type string $name           Theme name, e.g. 'Twenty Nineteen'.
     234         *     @type string $slug           Theme slug, e.g. 'twentynineteen'.
    235235         *     @type string $version        Theme version, e.g. '1.1'.
    236236         *     @type string $author         Theme author username, e.g. 'melchoyce'.
    237          *     @type string $preview_url    Preview URL, e.g. 'http://2017.wordpress.net/'.
    238          *     @type string $screenshot_url Screenshot URL, e.g. 'https://wordpress.org/themes/twentyseventeen/'.
     237         *     @type string $preview_url    Preview URL, e.g. 'http://2019.wordpress.net/'.
     238         *     @type string $screenshot_url Screenshot URL, e.g. 'https://wordpress.org/themes/twentynineteen/'.
    239239         *     @type float  $rating         Rating score.
    240240         *     @type int    $num_ratings    The number of ratings.
    241          *     @type string $homepage       Theme homepage, e.g. 'https://wordpress.org/themes/twentyseventeen/'.
     241         *     @type string $homepage       Theme homepage, e.g. 'https://wordpress.org/themes/twentynineteen/'.
    242242         *     @type string $description    Theme description.
    243243         *     @type string $download_link  Theme ZIP download URL.
    244244         * }
  • src/wp-admin/includes/upgrade.php

    diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php
    index 9dab2e9cdb..011884b9fd 100644
    a b Commenter avatars come from <a href="https://gravatar.com">Gravatar</a>.' ); 
    330330        update_option( 'widget_archives', array ( 2 => array ( 'title' => '', 'count' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) );
    331331        update_option( 'widget_categories', array ( 2 => array ( 'title' => '', 'count' => 0, 'hierarchical' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) );
    332332        update_option( 'widget_meta', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
    333         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 ) );
     333        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 ) );
    334334        if ( ! is_multisite() )
    335335                update_user_meta( $user_id, 'show_welcome_panel', 1 );
    336336        elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) )
  • src/wp-admin/nav-menus.php

    diff --git a/src/wp-admin/nav-menus.php b/src/wp-admin/nav-menus.php
    index 185d54b1b7..1bc1c2e530 100644
    a b if ( ! current_theme_supports( 'menus' ) && ! $num_locations ) 
    519519if ( ! $locations_screen ) : // Main tab
    520520        $overview  = '<p>' . __( 'This screen is used for managing your navigation menus.' ) . '</p>';
    521521        /* translators: 1: Widgets admin screen URL, 2 and 3: The name of the default themes */
    522         $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>';
     522        $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>';
    523523        $overview .= '<p>' . __( 'From this screen you can:' ) . '</p>';
    524524        $overview .= '<ul><li>' . __( 'Create, edit, and delete menus' ) . '</li>';
    525525        $overview .= '<li>' . __( 'Add, organize, and modify individual menu items' ) . '</li></ul>';
  • tests/phpunit/tests/customize/widgets.php

    diff --git a/tests/phpunit/tests/customize/widgets.php b/tests/phpunit/tests/customize/widgets.php
    index 5a70815e4e..529d51c0ff 100644
    a b class Tests_WP_Customize_Widgets extends WP_UnitTestCase { 
    3232
    3333                unset( $GLOBALS['_wp_sidebars_widgets'] ); // clear out cache set by wp_get_sidebars_widgets()
    3434                $sidebars_widgets = wp_get_sidebars_widgets();
    35                 $this->assertEqualSets( array( 'wp_inactive_widgets', 'sidebar-1', 'sidebar-2', 'sidebar-3' ), array_keys( wp_get_sidebars_widgets() ) );
     35                $this->assertEqualSets( array( 'wp_inactive_widgets', 'sidebar-1' ), array_keys( wp_get_sidebars_widgets() ) );
    3636                $this->assertContains( 'search-2', $sidebars_widgets['sidebar-1'] );
    3737                $this->assertContains( 'categories-2', $sidebars_widgets['sidebar-1'] );
    3838                $this->assertArrayHasKey( 2, get_option( 'widget_search' ) );