Merge branch 'trunk' into hello-dolly

Author: afragen

.github/workflows/upgrade-testing.yml

@@ -102,7 +102,6 @@ jobs:
         db-type: [ 'mysql' ]
         db-version: [ '5.7', '8.4' ]
         wp: [ '6.0', '6.1', '6.2', '6.3', '6.4', '6.5' ]
->>>>>>> Stashed changes
         multisite: [ false, true ]
 
         exclude:

package-lock.json

@@ -65,7 +65,6 @@
 				<div class="about__image">
 					<img src="https://s.w.org/images/core/6.8/feature-01.webp?v=23478" alt="" height="436" width="436" />
 				</div>
->>>>>>> Stashed changes
 			</div>
 		</div>
 
@@ -91,19 +90,6 @@
 					</p>
 				<?php endif; ?>
 			</div>
-			<div class="column is-vertically-aligned-center">
-				<div class="about__image">
-					<img src="https://s.w.org/images/core/6.8/feature-01.webp?v=23478" alt="" height="436" width="436" />
-				</div>
-			</div>
-		</div>
-
-		<div class="about__section has-2-columns">
-			<div class="column is-vertically-aligned-center">
-				<div class="about__image">
-					<img src="https://s.w.org/images/core/6.8/feature-02.png?v=23478" alt="" height="436" width="436" />
-				</div>
-			</div>
 			<div class="column is-vertically-aligned-center">
 				<h3><?php _e( 'Editor improvements' ); ?></h3>
 				<p><?php _e( 'Easier ways to see your options in Data Views, and you can exclude sticky posts from the Query Loop. Plus, you&#8217;ll find lots of little improvements in the editor that smooth your way through everything you build.' ); ?></p>
@@ -117,58 +103,46 @@
 			</div>
 			<div class="column is-vertically-aligned-center">
 				<div class="about__image">
-					<img src="https://s.w.org/images/core/6.8/feature-03.webp?v=23478" alt="" height="436" width="436" />
+					<img src="https://s.w.org/images/core/6.8/feature-01.webp?v=23478" alt="" height="436" width="436" />
 				</div>
 			</div>
 		</div>
 
 		<div class="about__section has-2-columns">
 			<div class="column is-vertically-aligned-center">
 				<div class="about__image">
-					<img src="https://s.w.org/images/core/6.8/feature-04.png?v=23478" alt="" height="436" width="436" />
+					<img src="https://s.w.org/images/core/6.8/feature-02.png?v=23478" alt="" height="436" width="436" />
 				</div>
 			</div>
 			<div class="column is-vertically-aligned-center">
-				<h3><?php _e( 'Stronger password security with bcrypt' ); ?></h3>
-				<p><?php _e( 'Now passwords are harder to crack with bcrypt hashing, which takes a lot more computing power to break. This strengthens overall security, as do other encryption improvements across WordPress. You don&#8217;t need to do anything—everything updates automatically.' ); ?></p>
+				<h3><?php _e( 'Editor improvements' ); ?></h3>
+				<p><?php _e( 'Easier ways to see your options in Data Views, and you can exclude sticky posts from the Query Loop. Plus, you&#8217;ll find lots of little improvements in the editor that smooth your way through everything you build.' ); ?></p>
 			</div>
 		</div>
 
 		<hr class="is-invisible is-large" />
 
 		<div class="about__section has-2-columns">
 			<div class="column is-vertically-aligned-center">
-				<h3><?php _e( 'Rollbacks for plugin auto-updates' ); ?></h3>
-				<p><strong><?php _e( 'Auto-update your plugins with peace of mind.' ); ?></strong> <?php _e( 'Enjoy the ease of plugin auto-updates with the safety of rollbacks if anything goes wrong, improving your site&#8217;s security while minimizing potential downtime.' ); ?></p>
-			</div>
-			<div class="column is-vertically-aligned-center">
-				<div class="about__image">
-					<img src="https://s.w.org/images/core/6.6/feature-rollbacks.webp" alt="" height="436" width="436" />
-=======
 				<h3><?php _e( 'Near-instant page loads, thanks to Speculative Loading' ); ?></h3>
 				<p><?php _e( 'In WordPress 6.8, pages load faster than ever. When you or your user hovers over or clicks a link, WordPress may preload the next page, for a smoother, near-instant experience. The system balances speed and efficiency, and you can control how it works, with a plugin or your own code. This feature only works in modern browsers—older ones will simply ignore it without any impact.' ); ?></p>
 			</div>
 			<div class="column is-vertically-aligned-center">
 				<div class="about__image">
 					<img src="https://s.w.org/images/core/6.8/feature-03.webp?v=23478" alt="" height="436" width="436" />
->>>>>>> Stashed changes
 				</div>
 			</div>
 		</div>
 
 		<div class="about__section has-2-columns">
 			<div class="column is-vertically-aligned-center">
 				<div class="about__image">
-<<<<<<< Updated upstream
-					<img src="https://s.w.org/images/core/6.6/overrides.webp" alt="" height="436" width="436" />
+					<img src="https://s.w.org/images/core/6.8/feature-04.png?v=23478" alt="" height="436" width="436" />
 				</div>
 			</div>
 			<div class="column is-vertically-aligned-center">
-				<h3><?php _e( 'Overrides' ); ?></h3>
-				<p><strong><?php _e( 'Add the ability to customize content in synced patterns.' ); ?></strong> <?php _e( 'Allow specific pieces of content to be customized in each instance of a synced pattern while keeping a consistent style for all instances, simplifying future updates. Currently, you can set overrides for Heading, Paragraph, Button, and Image blocks.' ); ?></p>
-=======
-					<img src="https://s.w.org/images/core/6.8/feature-04.png?v=23478" alt="" height="436" width="436" />
-				</div>
+				<h3><?php _e( 'Stronger password security with bcrypt' ); ?></h3>
+				<p><?php _e( 'Now passwords are harder to crack with bcrypt hashing, which takes a lot more computing power to break. This strengthens overall security, as do other encryption improvements across WordPress. You don&#8217;t need to do anything—everything updates automatically.' ); ?></p>
 			</div>
 			<div class="column is-vertically-aligned-center">
 				<h3><?php _e( 'Stronger password security with bcrypt' ); ?></h3>
@@ -202,9 +176,6 @@
 
 		<div class="about__section has-1-column">
 			<div class="column">
-				<p><?php _e( 'For a comprehensive overview of all the new features and enhancements in WordPress 6.6, please visit the feature-showcase website.' ); ?></p>
-			</div>
-			<div class="column aligncenter">
 				<div class="about__image">
 					<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false">
 						<path fill="#1e1e1e" d="M32.455 17.72a1.592 1.592 0 0 1 .599 2.195l-7.637 12.99a1.653 1.653 0 0 1-2.235.589 1.592 1.592 0 0 1-.599-2.195l7.637-12.99a1.653 1.653 0 0 1 2.235-.589ZM13.774 23.21a1.653 1.653 0 0 0-2.236.589 1.592 1.592 0 0 0 .6 2.195l.944.536c.783.444 1.783.18 2.235-.588a1.592 1.592 0 0 0-.599-2.196l-.944-.535ZM16.432 17.72a1.653 1.653 0 0 1 2.236.588l.545.928a1.592 1.592 0 0 1-.599 2.196 1.653 1.653 0 0 1-2.235-.588l-.546-.928a1.592 1.592 0 0 1 .6-2.196ZM25.637 16.5c0-.888-.733-1.607-1.637-1.607s-1.636.72-1.636 1.607v1.071c0 .888.732 1.608 1.636 1.608.904 0 1.637-.72 1.637-1.608V16.5Z"/>

src/wp-admin/about.php

@@ -1720,74 +1720,6 @@ private static function get_wp_filesystem(): array {
 			),
 		);
 
-		// Add more filesystem checks.
-		if ( defined( 'WPMU_PLUGIN_DIR' ) && is_dir( WPMU_PLUGIN_DIR ) ) {
-			$is_writable_wpmu_plugin_dir = wp_is_writable( WPMU_PLUGIN_DIR );
-
-			$fields['mu-plugins'] = array(
-				'label' => __( 'The must use plugins directory' ),
-				'value' => ( $is_writable_wpmu_plugin_dir ? __( 'Writable' ) : __( 'Not writable' ) ),
-				'debug' => ( $is_writable_wpmu_plugin_dir ? 'writable' : 'not writable' ),
-			);
-		}
->>>>>>> Stashed changes
-
-		return array(
-			'label'       => __( 'Filesystem Permissions' ),
-			'description' => __( 'Shows whether WordPress is able to write to the directories it needs access to.' ),
-			'fields'      => $fields,
-		);
-	}
-
-	/**
-	 * Gets the file system section of the debug data.
-	 *
-	 * @since 6.7.0
-	 *
-	 * @return array
-	 */
-	private static function get_wp_filesystem(): array {
-		$upload_dir                     = wp_upload_dir();
-		$is_writable_abspath            = wp_is_writable( ABSPATH );
-		$is_writable_wp_content_dir     = wp_is_writable( WP_CONTENT_DIR );
-		$is_writable_upload_dir         = wp_is_writable( $upload_dir['basedir'] );
-		$is_writable_wp_plugin_dir      = wp_is_writable( WP_PLUGIN_DIR );
-		$is_writable_template_directory = wp_is_writable( get_theme_root( get_template() ) );
-		$is_writable_fonts_dir          = wp_is_writable( wp_get_font_dir()['basedir'] );
-
-		$fields = array(
-			'wordpress'  => array(
-				'label' => __( 'The main WordPress directory' ),
-				'value' => ( $is_writable_abspath ? __( 'Writable' ) : __( 'Not writable' ) ),
-				'debug' => ( $is_writable_abspath ? 'writable' : 'not writable' ),
-			),
-			'wp-content' => array(
-				'label' => __( 'The wp-content directory' ),
-				'value' => ( $is_writable_wp_content_dir ? __( 'Writable' ) : __( 'Not writable' ) ),
-				'debug' => ( $is_writable_wp_content_dir ? 'writable' : 'not writable' ),
-			),
-			'uploads'    => array(
-				'label' => __( 'The uploads directory' ),
-				'value' => ( $is_writable_upload_dir ? __( 'Writable' ) : __( 'Not writable' ) ),
-				'debug' => ( $is_writable_upload_dir ? 'writable' : 'not writable' ),
-			),
-			'plugins'    => array(
-				'label' => __( 'The plugins directory' ),
-				'value' => ( $is_writable_wp_plugin_dir ? __( 'Writable' ) : __( 'Not writable' ) ),
-				'debug' => ( $is_writable_wp_plugin_dir ? 'writable' : 'not writable' ),
-			),
-			'themes'     => array(
-				'label' => __( 'The themes directory' ),
-				'value' => ( $is_writable_template_directory ? __( 'Writable' ) : __( 'Not writable' ) ),
-				'debug' => ( $is_writable_template_directory ? 'writable' : 'not writable' ),
-			),
-			'fonts'      => array(
-				'label' => __( 'The fonts directory' ),
-				'value' => ( $is_writable_fonts_dir ? __( 'Writable' ) : __( 'Not writable' ) ),
-				'debug' => ( $is_writable_fonts_dir ? 'writable' : 'not writable' ),
-			),
-		);
-
 		// Add more filesystem checks.
 		if ( defined( 'WPMU_PLUGIN_DIR' ) && is_dir( WPMU_PLUGIN_DIR ) ) {
 			$is_writable_wpmu_plugin_dir = wp_is_writable( WPMU_PLUGIN_DIR );

src/wp-admin/includes/class-wp-debug-data.php

@@ -841,8 +841,6 @@
 	'wp-includes/js/dist/undo-manager.min.js',
 	'wp-includes/js/dist/fields.min.js',
 	'wp-includes/js/dist/fields.js',
-    // 6.9
-	'wp-content/plugins/hello.php',
 );
 
 /**

src/wp-admin/includes/update-core.php

@@ -655,26 +655,6 @@ function _build_block_template_result_from_file( $template_file, $template_type
 			'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata'
 		);
 	}
-
-	if ( 'wp_template_part' === $template->type && $has_hooked_blocks ) {
-		/*
-		 * In order for hooked blocks to be inserted at positions first_child and last_child in a template part,
-		 * we need to wrap its content a mock template part block and traverse it.
-		 */
-		$content           = get_comment_delimited_block_content(
-			'core/template-part',
-			array(),
-			$template->content
-		);
-		$content           = traverse_and_serialize_blocks( parse_blocks( $content ), $before_block_visitor, $after_block_visitor );
-		$template->content = remove_serialized_parent_block( $content );
-	} else {
-		$template->content = traverse_and_serialize_blocks(
-			parse_blocks( $template->content ),
-			$before_block_visitor,
-			$after_block_visitor
-		);
-	}
 =======
 	if ( 'wp_template_part' === $template->type ) {
 		/*

src/wp-content/themes/twentytwenty/package-lock.json

@@ -225,8 +225,6 @@ public function set_quality( $quality = null, $dims = array() ) {
 						$this->image->setCompressionQuality( $quality );
 					}
 					break;
-<<<<<<< Updated upstream
-=======
 				case 'image/avif':
 					// Set the AVIF encoder to work faster, with minimal impact on image size.
 					$this->image->setOption( 'heic:speed', 7 );

src/wp-includes/block-template-utils.php

@@ -257,10 +257,6 @@ function wp_add_global_styles_for_blocks() {
 	$tree        = WP_Theme_JSON_Resolver::get_merged_data();
 	$tree        = WP_Theme_JSON_Resolver::resolve_theme_file_uris( $tree );
 	$block_nodes = $tree->get_styles_block_nodes();
-<<<<<<< Updated upstream
-	foreach ( $block_nodes as $metadata ) {
-		$block_css = $tree->get_styles_for_block( $metadata );
-=======
 
 	$can_use_cached = ! wp_is_development_mode( 'theme' );
 	$update_cache   = false;
@@ -301,7 +297,6 @@ function wp_add_global_styles_for_blocks() {
 		} else {
 			$block_css = $tree->get_styles_for_block( $metadata );
 		}
->>>>>>> Stashed changes
 
 		if ( ! wp_should_load_block_assets_on_demand() ) {
 			wp_add_inline_style( 'global-styles', $block_css );
@@ -348,13 +343,10 @@ function wp_add_global_styles_for_blocks() {
 			}
 		}
 	}
-<<<<<<< Updated upstream
-=======
 
 	if ( $update_cache ) {
 		set_transient( $cache_key, $cached );
 	}
->>>>>>> Stashed changes
 }
 
 /**

src/wp-includes/class-wp-image-editor-imagick.php

@@ -520,11 +520,6 @@ public function pop(): bool {
 			return false;
 		}
 
-		if ( 'context-node' === $item->bookmark_name ) {
-			$this->stack[] = $item;
-			return false;
-		}
-
 		$this->after_element_pop( $item );
 		return true;
 	}
@@ -541,10 +536,6 @@ public function pop(): bool {
 	 */
 	public function pop_until( string $html_tag_name ): bool {
 		foreach ( $this->walk_up() as $item ) {
-			if ( 'context-node' === $item->bookmark_name ) {
-				return true;
-			}
-
 			$this->pop();
 
 			if ( 'html' !== $item->namespace ) {