Merge branch 'trunk' into fix/permalink-future-posts

kushagra-goyal-14 · web-flow · commit 62505d3419b7 · 2025-07-16T00:53:14.000+05:30
diff --git a/src/wp-admin/css/forms.css b/src/wp-admin/css/forms.css
@@ -1592,10 +1592,6 @@ table.form-table td .updated p {
 		line-height: 0.76190476;
 	}
 
-	.wp-upload-form input[type="submit"] {
-		margin-top: 10px;
-	}
-
 	.wp-core-ui select,
 	.wp-admin .form-table select {
 		min-height: 40px;
diff --git a/src/wp-admin/css/themes.css b/src/wp-admin/css/themes.css
@@ -2013,6 +2013,10 @@ body.full-overlay-active {
 	.upload-plugin .wp-upload-form {
 		display: block;
 	}
+
+	:is(.upload-theme, .upload-plugin) .wp-upload-form input[type="submit"] {
+		margin-top: 10px;
+	}
 }
 
 @media aural {
diff --git a/src/wp-admin/includes/media.php b/src/wp-admin/includes/media.php
@@ -2285,7 +2285,7 @@ function media_upload_form( $errors = null ) {
 			_ex( 'Upload', 'verb' );
 			?>
 		</label>
-		<input type="file" name="async-upload" id="async-upload" />
+		<input type="file" name="async-upload" id="async-upload" required />
 		<?php submit_button( _x( 'Upload', 'verb' ), 'primary', 'html-upload', false ); ?>
 		<a href="#" onclick="try{top.tb_remove();}catch(e){}; return false;"><?php _e( 'Cancel' ); ?></a>
 	</p>
diff --git a/src/wp-admin/media-new.php b/src/wp-admin/media-new.php
@@ -64,7 +64,7 @@
 
 require_once ABSPATH . 'wp-admin/admin-header.php';
 
-$form_class = 'media-upload-form type-form validate';
+$form_class = 'wp-upload-form media-upload-form type-form validate';
 
 if ( get_user_setting( 'uploader' ) || isset( $_GET['browser-uploader'] ) ) {
 	$form_class .= ' html-uploader';
diff --git a/src/wp-content/themes/twentyfourteen/functions.php b/src/wp-content/themes/twentyfourteen/functions.php
@@ -345,10 +345,10 @@ function twentyfourteen_scripts() {
 	wp_enqueue_style( 'genericons', get_template_directory_uri() . '/genericons/genericons.css', array(), '3.0.3' );
 
 	// Load our main stylesheet.
-	wp_enqueue_style( 'twentyfourteen-style', get_stylesheet_uri(), array(), '20250415' );
+	wp_enqueue_style( 'twentyfourteen-style', get_stylesheet_uri(), array(), '20250715' );
 
 	// Theme block stylesheet.
-	wp_enqueue_style( 'twentyfourteen-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentyfourteen-style' ), '20240708' );
+	wp_enqueue_style( 'twentyfourteen-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentyfourteen-style' ), '20250715' );
 
 	// Load the Internet Explorer specific stylesheet.
 	wp_enqueue_style( 'twentyfourteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentyfourteen-style' ), '20140711' );
diff --git a/src/wp-content/themes/twentyfourteen/readme.txt b/src/wp-content/themes/twentyfourteen/readme.txt
@@ -3,7 +3,7 @@ Contributors: wordpressdotorg
 Requires at least: 3.6
 Tested up to: 6.8
 Requires PHP: 5.2.4
-Stable tag: 4.2
+Stable tag: 4.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, news, two-columns, three-columns, left-sidebar, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready, accessibility-ready, block-patterns
@@ -64,6 +64,11 @@ Source: https://stocksnap.io/photo/fog-mountain-ZKN6UKFKEO
 
 == Changelog ==
 
+= 4.3 =
+* Released: July 15, 2025
+
+https://wordpress.org/documentation/article/twenty-fourteen-changelog/#Version_4.3
+
 = 4.2 =
 * Released: April 15, 2025
 
diff --git a/src/wp-content/themes/twentyfourteen/style.css b/src/wp-content/themes/twentyfourteen/style.css
@@ -4,7 +4,7 @@ Theme URI: https://wordpress.org/themes/twentyfourteen/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: In 2014, our default theme lets you create a responsive magazine website with a sleek, modern design. Feature your favorite homepage content in either a grid or a slider. Use the three widget areas to customize your website, and change your content's layout with a full-width page template and a contributor page to show off your authors. Creating a magazine website with WordPress has never been easier.
-Version: 4.2
+Version: 4.3
 Requires at least: 3.6
 Tested up to: 6.8
 Requires PHP: 5.2.4
diff --git a/src/wp-content/themes/twentysixteen/functions.php b/src/wp-content/themes/twentysixteen/functions.php
@@ -391,7 +391,7 @@ function twentysixteen_scripts() {
 	wp_enqueue_style( 'genericons', get_template_directory_uri() . '/genericons/genericons.css', array(), '20201208' );
 
 	// Theme stylesheet.
-	wp_enqueue_style( 'twentysixteen-style', get_stylesheet_uri(), array(), '20250415' );
+	wp_enqueue_style( 'twentysixteen-style', get_stylesheet_uri(), array(), '20250715' );
 
 	// Theme block stylesheet.
 	wp_enqueue_style( 'twentysixteen-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentysixteen-style' ), '20240817' );
@@ -452,7 +452,7 @@ function twentysixteen_scripts() {
  */
 function twentysixteen_block_editor_styles() {
 	// Block styles.
-	wp_enqueue_style( 'twentysixteen-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20241202' );
+	wp_enqueue_style( 'twentysixteen-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20250715' );
 	// Add custom fonts.
 	$font_version = ( 0 === strpos( (string) twentysixteen_fonts_url(), get_template_directory_uri() . '/' ) ) ? '20230328' : null;
 	wp_enqueue_style( 'twentysixteen-fonts', twentysixteen_fonts_url(), array(), $font_version );
diff --git a/src/wp-content/themes/twentysixteen/readme.txt b/src/wp-content/themes/twentysixteen/readme.txt
@@ -3,7 +3,7 @@ Contributors: wordpressdotorg
 Requires at least: 4.4
 Tested up to: 6.8
 Requires PHP: 5.2.4
-Version: 3.5
+Version: 3.6
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: one-column, two-columns, right-sidebar, accessibility-ready, custom-background, custom-colors, custom-header, custom-menu, editor-style, featured-images, flexible-header, microformats, post-formats, rtl-language-support, sticky-post, threaded-comments, translation-ready, blog, block-patterns
@@ -72,6 +72,11 @@ Image used in screenshot.png: A photo by Austin Schmid (https://unsplash.com/sch
 
 == Changelog ==
 
+= 3.6 =
+* Released: July 15, 2025
+
+https://wordpress.org/documentation/article/twenty-sixteen-changelog/#Version_3.6
+
 = 3.5 =
 * Released: April 15, 2025
 
diff --git a/src/wp-content/themes/twentysixteen/style.css b/src/wp-content/themes/twentysixteen/style.css
@@ -4,7 +4,7 @@ Theme URI: https://wordpress.org/themes/twentysixteen/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: Twenty Sixteen is a modernized take on an ever-popular WordPress layout — the horizontal masthead with an optional right sidebar that works perfectly for blogs and websites. It has custom color options with beautiful default color schemes, a harmonious fluid grid using a mobile-first approach, and impeccable polish in every detail. Twenty Sixteen will make your WordPress look beautiful everywhere.
-Version: 3.5
+Version: 3.6
 Tested up to: 6.8
 Requires at least: 4.4
 Requires PHP: 5.2.4
diff --git a/src/wp-content/themes/twentytwelve/functions.php b/src/wp-content/themes/twentytwelve/functions.php
@@ -212,7 +212,7 @@ function twentytwelve_scripts_styles() {
 	}
 
 	// Loads our main stylesheet.
-	wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri(), array(), '20250415' );
+	wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri(), array(), '20250715' );
 
 	// Theme block stylesheet.
 	wp_enqueue_style( 'twentytwelve-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentytwelve-style' ), '20240812' );
@@ -230,7 +230,7 @@ function twentytwelve_scripts_styles() {
  */
 function twentytwelve_block_editor_styles() {
 	// Block styles.
-	wp_enqueue_style( 'twentytwelve-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20240811' );
+	wp_enqueue_style( 'twentytwelve-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20250715' );
 	// Add custom fonts.
 	$font_version = ( 0 === strpos( (string) twentytwelve_get_font_url(), get_template_directory_uri() . '/' ) ) ? '20230328' : null;
 	wp_enqueue_style( 'twentytwelve-fonts', twentytwelve_get_font_url(), array(), $font_version );
diff --git a/src/wp-content/themes/twentytwelve/readme.txt b/src/wp-content/themes/twentytwelve/readme.txt
@@ -3,7 +3,7 @@ Contributors: wordpressdotorg
 Requires at least: 3.5
 Tested up to: 6.8
 Requires PHP: 5.2.4
-Stable tag: 4.5
+Stable tag: 4.6
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, one-column, two-columns, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready, block-patterns
@@ -53,6 +53,11 @@ Source: https://fontsource.org/fonts/open-sans
 
 == Changelog ==
 
+= 4.6 =
+* Released: July 15, 2025
+
+https://wordpress.org/documentation/article/twenty-twelve-changelog/#Version_4.6
+
 = 4.5 =
 * Released: April 15, 2025
 
diff --git a/src/wp-content/themes/twentytwelve/style.css b/src/wp-content/themes/twentytwelve/style.css
@@ -4,7 +4,7 @@ Theme URI: https://wordpress.org/themes/twentytwelve/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: The 2012 theme for WordPress is a fully responsive theme that looks great on any device. Features include a front page template with its own widgets, an optional display font, styling for post formats on both index and single views, and an optional no-sidebar page template. Make it yours with a custom menu, header image, and background.
-Version: 4.5
+Version: 4.6
 Tested up to: 6.8
 Requires at least: 3.5
 Requires PHP: 5.2.4
diff --git a/src/wp-content/themes/twentytwentyfive/readme.txt b/src/wp-content/themes/twentytwentyfive/readme.txt
@@ -3,7 +3,7 @@ Contributors: wordpressdotorg
 Requires at least: 6.7
 Tested up to: 6.8
 Requires PHP: 7.2
-Stable tag: 1.2
+Stable tag: 1.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -14,6 +14,11 @@ Twenty Twenty-Five emphasizes simplicity and adaptability. It offers flexible de
 
 == Changelog ==
 
+= 1.3 =
+* Released: July 15, 2025
+
+https://wordpress.org/documentation/article/twenty-twenty-five-changelog/#Version_1.3
+
 = 1.2 =
 * Released: April 15, 2025
 
diff --git a/src/wp-content/themes/twentytwentyfive/style.css b/src/wp-content/themes/twentytwentyfive/style.css
@@ -7,7 +7,7 @@ Description: Twenty Twenty-Five emphasizes simplicity and adaptability. It offer
 Requires at least: 6.7
 Tested up to: 6.8
 Requires PHP: 7.2
-Version: 1.2
+Version: 1.3
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: twentytwentyfive
diff --git a/src/wp-content/themes/twentytwentyone/assets/css/ie.css b/src/wp-content/themes/twentytwentyone/assets/css/ie.css
@@ -9,7 +9,7 @@ Description: Twenty Twenty-One is a blank canvas for your ideas and it makes the
 Requires at least: 5.3
 Tested up to: 6.8
 Requires PHP: 5.6
-Version: 2.5
+Version: 2.6
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: twentytwentyone
diff --git a/src/wp-content/themes/twentytwentyone/assets/sass/01-settings/file-header.scss b/src/wp-content/themes/twentytwentyone/assets/sass/01-settings/file-header.scss
@@ -7,7 +7,7 @@ Description: Twenty Twenty-One is a blank canvas for your ideas and it makes the
 Requires at least: 5.3
 Tested up to: 6.8
 Requires PHP: 5.6
-Version: 2.5
+Version: 2.6
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: twentytwentyone
diff --git a/src/wp-content/themes/twentytwentyone/package-lock.json b/src/wp-content/themes/twentytwentyone/package-lock.json
diff --git a/src/wp-content/themes/twentytwentyone/package.json b/src/wp-content/themes/twentytwentyone/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "twentytwentyone",
-	"version": "2.5.0",
+	"version": "2.6.0",
 	"description": "Default WP Theme",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/src/wp-content/themes/twentytwentyone/readme.txt b/src/wp-content/themes/twentytwentyone/readme.txt
@@ -3,7 +3,7 @@ Contributors: wordpressdotorg
 Requires at least: 5.3
 Tested up to: 6.8
 Requires PHP: 5.6
-Stable tag: 2.5
+Stable tag: 2.6
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -30,6 +30,11 @@ No data is saved in the database or transferred.
 
 == Changelog ==
 
+= 2.6 =
+* Released: July 15, 2025
+
+https://wordpress.org/documentation/article/twenty-twenty-one-changelog/#Version_2.6
+
 = 2.5 =
 * Released: April 15, 2025
 
diff --git a/src/wp-content/themes/twentytwentyone/style-rtl.css b/src/wp-content/themes/twentytwentyone/style-rtl.css
@@ -9,7 +9,7 @@ Description: Twenty Twenty-One is a blank canvas for your ideas and it makes the
 Requires at least: 5.3
 Tested up to: 6.8
 Requires PHP: 5.6
-Version: 2.5
+Version: 2.6
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: twentytwentyone
diff --git a/src/wp-content/themes/twentytwentyone/style.css b/src/wp-content/themes/twentytwentyone/style.css
@@ -9,7 +9,7 @@ Description: Twenty Twenty-One is a blank canvas for your ideas and it makes the
 Requires at least: 5.3
 Tested up to: 6.8
 Requires PHP: 5.6
-Version: 2.5
+Version: 2.6
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: twentytwentyone
diff --git a/src/wp-includes/class-wp-rewrite.php b/src/wp-includes/class-wp-rewrite.php
@@ -1288,7 +1288,7 @@ public function rewrite_rules() {
 		$favicon_rewrite = ( empty( $home_path['path'] ) || '/' === $home_path['path'] ) ? array( 'favicon\.ico$' => $this->index . '?favicon=1' ) : array();
 
 		// sitemap.xml -- only if installed at the root.
-		$sitemap_rewrite = ( empty( $home_path['path'] ) || '/' === $home_path['path'] ) ? array( 'sitemap\.xml' => $this->index . '??sitemap=index' ) : array();
+		$sitemap_rewrite = ( empty( $home_path['path'] ) || '/' === $home_path['path'] ) ? array( 'sitemap\.xml' => $this->index . '?sitemap=index' ) : array();
 
 		// Old feed and service files.
 		$deprecated_files = array(
diff --git a/src/wp-includes/global-styles-and-settings.php b/src/wp-includes/global-styles-and-settings.php
@@ -483,19 +483,16 @@ function wp_get_theme_data_template_parts() {
 	$cache_key      = 'wp_get_theme_data_template_parts';
 	$can_use_cached = ! wp_is_development_mode( 'theme' );
 
-	$metadata = false;
 	if ( $can_use_cached ) {
 		$metadata = wp_cache_get( $cache_key, $cache_group );
 		if ( false !== $metadata ) {
 			return $metadata;
 		}
 	}
 
-	if ( false === $metadata ) {
-		$metadata = WP_Theme_JSON_Resolver::get_theme_data( array(), array( 'with_supports' => false ) )->get_template_parts();
-		if ( $can_use_cached ) {
-			wp_cache_set( $cache_key, $metadata, $cache_group );
-		}
+	$metadata = WP_Theme_JSON_Resolver::get_theme_data( array(), array( 'with_supports' => false ) )->get_template_parts();
+	if ( $can_use_cached ) {
+		wp_cache_set( $cache_key, $metadata, $cache_group );
 	}
 
 	return $metadata;
diff --git a/src/wp-includes/ms-functions.php b/src/wp-includes/ms-functions.php
@@ -730,7 +730,7 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
 	 * unless it's the user's own username.
 	 */
 	if ( username_exists( $blogname ) ) {
-		if ( ! is_object( $user ) || ( is_object( $user ) && $user->user_login !== $blogname ) ) {
+		if ( ! $user instanceof WP_User || $user->user_login !== $blogname ) {
 			$errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
 		}
 	}
diff --git a/src/wp-includes/option.php b/src/wp-includes/option.php
@@ -1669,7 +1669,7 @@ function delete_expired_transients( $force_db = false ) {
 				time()
 			)
 		);
-	} elseif ( is_multisite() && is_main_site() && is_main_network() ) {
+	} elseif ( is_main_site() && is_main_network() ) {
 		// Multisite stores site transients in the sitemeta table.
 		$wpdb->query(
 			$wpdb->prepare(
diff --git a/src/wp-includes/rewrite.php b/src/wp-includes/rewrite.php
@@ -412,7 +412,7 @@ function wp_resolve_numeric_slug_conflicts( $query_vars = array() ) {
 
 	// This is the potentially clashing slug.
 	$value = '';
-	if ( $compare && array_key_exists( $compare, $query_vars ) ) {
+	if ( array_key_exists( $compare, $query_vars ) ) {
 		$value = $query_vars[ $compare ];
 	}
 
@@ -460,9 +460,7 @@ function wp_resolve_numeric_slug_conflicts( $query_vars = array() ) {
 	}
 
 	// If we've gotten to this point, we have a slug/date clash. First, adjust for nextpage.
-	if ( '' !== $maybe_page ) {
-		$query_vars['page'] = (int) $maybe_page;
-	}
+	$query_vars['page'] = $maybe_page;
 
 	// Next, unset autodetected date-related query vars.
 	unset( $query_vars['year'] );
diff --git a/tests/phpunit/tests/readme.php b/tests/phpunit/tests/readme.php
@@ -11,10 +11,6 @@ class Tests_Readme extends WP_UnitTestCase {
 	 * @coversNothing
 	 */
 	public function test_readme_php_version() {
-		$this->markTestSkipped(
-			'Temporarily disabled. Test should be re-enabled once WordPress is fully compatible with PHP 8.0+.'
-		);
-
 		// This test is designed to only run on trunk.
 		$this->skipOnAutomatedBranches();
 

Original file line number	Diff line number	Diff line change
`@@ -2013,6 +2013,10 @@ body.full-overlay-active {`
`2013`	`2013`	`.upload-plugin .wp-upload-form {`
`2014`	`2014`	`display: block;`
`2015`	`2015`	`}`
	`2016`	`+`
	`2017`	`+ :is(.upload-theme, .upload-plugin) .wp-upload-form input[type="submit"] {`
	`2018`	`+ margin-top: 10px;`
	`2019`	`+ }`
`2016`	`2020`	`}`
`2017`	`2021`
`2018`	`2022`	`@media aural {`