Merge remote-tracking branch 'upstream/trunk' into HEAD

Author: dmsnell

.github/workflows/reusable-end-to-end-tests.yml

@@ -100,7 +100,7 @@ jobs:
 
       - name: Install Playwright browsers
         if: ${{ inputs.install-playwright }}
-        run: npx playwright install --with-deps
+        run: npx playwright install --with-deps chromium
 
       - name: Build WordPress
         run: npm run build

.github/workflows/reusable-performance-test-v2.yml

@@ -227,9 +227,6 @@ jobs:
       - name: Deactivate WordPress Importer plugin
         run: npm run env:cli -- plugin deactivate wordpress-importer --path="/var/www/${LOCAL_DIR}"
 
-      - name: Update permalink structure
-        run: npm run env:cli -- rewrite structure '/%year%/%monthnum%/%postname%/' --path="/var/www/${LOCAL_DIR}"
-
       - name: Install additional languages
         run: |
           npm run env:cli -- language core install de_DE --path="/var/www/${LOCAL_DIR}"

.github/workflows/reusable-performance.yml

@@ -203,9 +203,6 @@ jobs:
       - name: Deactivate WordPress Importer plugin
         run: npm run env:cli -- plugin deactivate wordpress-importer --path="/var/www/${LOCAL_DIR}"
 
-      - name: Update permalink structure
-        run: npm run env:cli -- rewrite structure '/%year%/%monthnum%/%postname%/' --path="/var/www/${LOCAL_DIR}"
-
       - name: Install additional languages
         run: |
           npm run env:cli -- language core install de_DE --path="/var/www/${LOCAL_DIR}"

phpcs.xml.dist

@@ -42,6 +42,9 @@
 	<!-- Exclude the build folder in the current directory. -->
 	<exclude-pattern type="relative">^build/*</exclude-pattern>
 
+	<!-- Exclude the local copy of the Gutenberg repository. -->
+	<exclude-pattern>/gutenberg/*</exclude-pattern>
+
 	<!-- Directories and third party library exclusions. -->
 	<exclude-pattern>/node_modules/*</exclude-pattern>
 	<exclude-pattern>/vendor/*</exclude-pattern>

src/wp-admin/css/customize-controls.css

@@ -273,8 +273,9 @@ body.trashing #publish-settings {
 	margin: 0;
 	position: absolute;
 	top: 50%;
-	transform: translateY(-50%);
+	transform: translateY(-50%) !important;
 	right: 0;
+	background: #fff !important;
 }
 
 .preview-link-wrapper {
@@ -284,7 +285,7 @@ body.trashing #publish-settings {
 .customize-copy-preview-link:before,
 .customize-copy-preview-link:after {
 	content: "";
-	height: 32px;
+	height: 40px;
 	position: absolute;
 	background: #fff;
 	top: 0;

src/wp-admin/css/dashboard.css

@@ -219,20 +219,19 @@
 }
 
 .welcome-panel .welcome-panel-close {
+	display: flex;
+	align-items: center;
 	position: absolute;
 	top: 10px;
 	right: 10px;
-	padding: 10px 15px 10px 24px;
+	padding: 10px 15px;
 	font-size: 13px;
 	line-height: 1.23076923; /* Chrome rounding, needs to be 16px equivalent */
 	text-decoration: none;
 	z-index: 1; /* Raise above the version image. */
 }
 
 .welcome-panel .welcome-panel-close:before {
-	position: absolute;
-	top: 8px;
-	left: 0;
 	transition: all .1s ease-in-out;
 	content: '\f335';
 	font-size: 24px;
@@ -721,14 +720,6 @@ body #dashboard-widgets .postbox form .submit {
 	margin-bottom: 10px;
 }
 
-#dashboard_right_now .inside {
-	padding: 0;
-}
-
-#dashboard_right_now .main {
-	padding: 16px 16px 11px;
-}
-
 #dashboard_right_now .main p {
 	margin: 0;
 }

src/wp-admin/css/list-tables.css

@@ -1424,7 +1424,7 @@ ul.cat-checklist input[name="post_category[]"]:indeterminate::before {
 	content: "\f463";
 	content: "\f463" / '';
 	display: inline-block;
-	font: normal 20px/1.9 dashicons; /* line-height 1.9 = 38px to match button */
+	font: normal 16px/1.875 dashicons; /* line-height 1.875 = 30px to match button */
 	margin: 0 5px 0 -2px;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
@@ -1567,6 +1567,13 @@ div.action-links,
 	margin: 0; /* Override existing margins */
 }
 
+/* Use compact size for space-constrained plugin cards */
+.plugin-action-buttons li .button {
+	min-height: 32px;
+	line-height: 2.30769231; /* 30px for 32px min-height */
+	padding: 0 12px;
+}
+
 .plugin-card h3 {
 	margin: 0 12px 12px 0;
 	font-size: 18px;

src/wp-admin/css/login.css

@@ -66,6 +66,10 @@ p {
 	background-color: #eff9f1;
 }
 
+.login .notice {
+	background-color: #fff;
+}
+
 /* Match border color from common.css */
 .login .notice-error {
 	border-left-color: #cc1818;

src/wp-admin/includes/schema.php

@@ -409,163 +409,163 @@ function populate_options( array $options = array() ) {
 	}
 
 	$defaults = array(
-		'siteurl'                         => $guessurl,
-		'home'                            => $guessurl,
-		'blogname'                        => __( 'My Site' ),
-		'blogdescription'                 => '',
-		'users_can_register'              => 0,
-		'admin_email'                     => '[email protected]',
+		'siteurl'                           => $guessurl,
+		'home'                              => $guessurl,
+		'blogname'                          => __( 'My Site' ),
+		'blogdescription'                   => '',
+		'users_can_register'                => 0,
+		'admin_email'                       => '[email protected]',
 		/* translators: Default start of the week. 0 = Sunday, 1 = Monday. */
-		'start_of_week'                   => _x( '1', 'start of week' ),
-		'use_balanceTags'                 => 0,
-		'use_smilies'                     => 1,
-		'require_name_email'              => 1,
-		'comments_notify'                 => 1,
-		'posts_per_rss'                   => 10,
-		'rss_use_excerpt'                 => 0,
-		'mailserver_url'                  => 'mail.example.com',
-		'mailserver_login'                => '[email protected]',
-		'mailserver_pass'                 => '',
-		'mailserver_port'                 => 110,
-		'default_category'                => 1,
-		'default_comment_status'          => 'open',
-		'default_ping_status'             => 'open',
-		'default_pingback_flag'           => 1,
-		'posts_per_page'                  => 10,
+		'start_of_week'                     => _x( '1', 'start of week' ),
+		'use_balanceTags'                   => 0,
+		'use_smilies'                       => 1,
+		'require_name_email'                => 1,
+		'comments_notify'                   => 1,
+		'posts_per_rss'                     => 10,
+		'rss_use_excerpt'                   => 0,
+		'mailserver_url'                    => 'mail.example.com',
+		'mailserver_login'                  => '[email protected]',
+		'mailserver_pass'                   => '',
+		'mailserver_port'                   => 110,
+		'default_category'                  => 1,
+		'default_comment_status'            => 'open',
+		'default_ping_status'               => 'open',
+		'default_pingback_flag'             => 1,
+		'posts_per_page'                    => 10,
 		/* translators: Default date format, see https://www.php.net/manual/datetime.format.php */
-		'date_format'                     => __( 'F j, Y' ),
+		'date_format'                       => __( 'F j, Y' ),
 		/* translators: Default time format, see https://www.php.net/manual/datetime.format.php */
-		'time_format'                     => __( 'g:i a' ),
+		'time_format'                       => __( 'g:i a' ),
 		/* translators: Links last updated date format, see https://www.php.net/manual/datetime.format.php */
-		'links_updated_date_format'       => __( 'F j, Y g:i a' ),
-		'comment_moderation'              => 0,
-		'moderation_notify'               => 1,
-		'permalink_structure'             => '',
-		'rewrite_rules'                   => '',
-		'hack_file'                       => 0,
-		'blog_charset'                    => 'UTF-8',
-		'moderation_keys'                 => '',
-		'active_plugins'                  => array(),
-		'category_base'                   => '',
-		'ping_sites'                      => 'https://rpc.pingomatic.com/',
-		'comment_max_links'               => 2,
-		'gmt_offset'                      => $gmt_offset,
+		'links_updated_date_format'         => __( 'F j, Y g:i a' ),
+		'comment_moderation'                => 0,
+		'moderation_notify'                 => 1,
+		'permalink_structure'               => '',
+		'rewrite_rules'                     => '',
+		'hack_file'                         => 0,
+		'blog_charset'                      => 'UTF-8',
+		'moderation_keys'                   => '',
+		'active_plugins'                    => array(),
+		'category_base'                     => '',
+		'ping_sites'                        => 'https://rpc.pingomatic.com/',
+		'comment_max_links'                 => 2,
+		'gmt_offset'                        => $gmt_offset,
 
 		// 1.5.0
-		'default_email_category'          => 1,
-		'recently_edited'                 => '',
-		'template'                        => $template,
-		'stylesheet'                      => $stylesheet,
-		'comment_registration'            => 0,
-		'html_type'                       => 'text/html',
+		'default_email_category'            => 1,
+		'recently_edited'                   => '',
+		'template'                          => $template,
+		'stylesheet'                        => $stylesheet,
+		'comment_registration'              => 0,
+		'html_type'                         => 'text/html',
 
 		// 1.5.1
-		'use_trackback'                   => 0,
+		'use_trackback'                     => 0,
 
 		// 2.0.0
-		'default_role'                    => 'subscriber',
-		'db_version'                      => $wp_db_version,
+		'default_role'                      => 'subscriber',
+		'db_version'                        => $wp_db_version,
 
 		// 2.0.1
-		'uploads_use_yearmonth_folders'   => 1,
-		'upload_path'                     => '',
+		'uploads_use_yearmonth_folders'     => 1,
+		'upload_path'                       => '',
 
 		// 2.1.0
-		'blog_public'                     => '1',
-		'default_link_category'           => 2,
-		'show_on_front'                   => 'posts',
+		'blog_public'                       => '1',
+		'default_link_category'             => 2,
+		'show_on_front'                     => 'posts',
 
 		// 2.2.0
-		'tag_base'                        => '',
+		'tag_base'                          => '',
 
 		// 2.5.0
-		'show_avatars'                    => '1',
-		'avatar_rating'                   => 'G',
-		'upload_url_path'                 => '',
-		'thumbnail_size_w'                => 150,
-		'thumbnail_size_h'                => 150,
-		'thumbnail_crop'                  => 1,
-		'medium_size_w'                   => 300,
-		'medium_size_h'                   => 300,
+		'show_avatars'                      => '1',
+		'avatar_rating'                     => 'G',
+		'upload_url_path'                   => '',
+		'thumbnail_size_w'                  => 150,
+		'thumbnail_size_h'                  => 150,
+		'thumbnail_crop'                    => 1,
+		'medium_size_w'                     => 300,
+		'medium_size_h'                     => 300,
 
 		// 2.6.0
-		'avatar_default'                  => 'mystery',
+		'avatar_default'                    => 'mystery',
 
 		// 2.7.0
-		'large_size_w'                    => 1024,
-		'large_size_h'                    => 1024,
-		'image_default_link_type'         => 'none',
-		'image_default_size'              => '',
-		'image_default_align'             => '',
-		'close_comments_for_old_posts'    => 0,
-		'close_comments_days_old'         => 14,
-		'thread_comments'                 => 1,
-		'thread_comments_depth'           => 5,
-		'page_comments'                   => 0,
-		'comments_per_page'               => 50,
-		'default_comments_page'           => 'newest',
-		'comment_order'                   => 'asc',
-		'sticky_posts'                    => array(),
-		'widget_categories'               => array(),
-		'widget_text'                     => array(),
-		'widget_rss'                      => array(),
-		'uninstall_plugins'               => array(),
+		'large_size_w'                      => 1024,
+		'large_size_h'                      => 1024,
+		'image_default_link_type'           => 'none',
+		'image_default_size'                => '',
+		'image_default_align'               => '',
+		'close_comments_for_old_posts'      => 0,
+		'close_comments_days_old'           => 14,
+		'thread_comments'                   => 1,
+		'thread_comments_depth'             => 5,
+		'page_comments'                     => 0,
+		'comments_per_page'                 => 50,
+		'default_comments_page'             => 'newest',
+		'comment_order'                     => 'asc',
+		'sticky_posts'                      => array(),
+		'widget_categories'                 => array(),
+		'widget_text'                       => array(),
+		'widget_rss'                        => array(),
+		'uninstall_plugins'                 => array(),
 
 		// 2.8.0
-		'timezone_string'                 => $timezone_string,
+		'timezone_string'                   => $timezone_string,
 
 		// 3.0.0
-		'page_for_posts'                  => 0,
-		'page_on_front'                   => 0,
+		'page_for_posts'                    => 0,
+		'page_on_front'                     => 0,
 
 		// 3.1.0
-		'default_post_format'             => 0,
+		'default_post_format'               => 0,
 
 		// 3.5.0
-		'link_manager_enabled'            => 0,
+		'link_manager_enabled'              => 0,
 
 		// 4.3.0
-		'finished_splitting_shared_terms' => 1,
-		'site_icon'                       => 0,
+		'finished_splitting_shared_terms'   => 1,
+		'site_icon'                         => 0,
 
 		// 4.4.0
-		'medium_large_size_w'             => 768,
-		'medium_large_size_h'             => 0,
+		'medium_large_size_w'               => 768,
+		'medium_large_size_h'               => 0,
 
 		// 4.9.6
-		'wp_page_for_privacy_policy'      => 0,
+		'wp_page_for_privacy_policy'        => 0,
 
 		// 4.9.8
-		'show_comments_cookies_opt_in'    => 1,
+		'show_comments_cookies_opt_in'      => 1,
 
 		// 5.3.0
-		'admin_email_lifespan'            => ( time() + 6 * MONTH_IN_SECONDS ),
+		'admin_email_lifespan'              => ( time() + 6 * MONTH_IN_SECONDS ),
 
 		// 5.5.0
-		'disallowed_keys'                 => '',
-		'comment_previously_approved'     => 1,
-		'auto_plugin_theme_update_emails' => array(),
+		'disallowed_keys'                   => '',
+		'comment_previously_approved'       => 1,
+		'auto_plugin_theme_update_emails'   => array(),
 
 		// 5.6.0
-		'auto_update_core_dev'            => 'enabled',
-		'auto_update_core_minor'          => 'enabled',
+		'auto_update_core_dev'              => 'enabled',
+		'auto_update_core_minor'            => 'enabled',
 		/*
 		 * Default to enabled for new installs.
 		 * See https://core.trac.wordpress.org/ticket/51742.
 		 */
-		'auto_update_core_major'          => 'enabled',
+		'auto_update_core_major'            => 'enabled',
 
 		// 5.8.0
-		'wp_force_deactivated_plugins'    => array(),
+		'wp_force_deactivated_plugins'      => array(),
 
 		// 6.4.0
-		'wp_attachment_pages_enabled'     => 0,
+		'wp_attachment_pages_enabled'       => 0,
 
 		// 6.9.0
-		'wp_notes_notify'                 => 1,
+		'wp_notes_notify'                   => 1,
 
 		// 7.0.0
-		'enable_real_time_collaboration'  => 0,
+		'wp_enable_real_time_collaboration' => 0,
 	);
 
 	// 3.3.0