Include 4 6.8-branch commits

Commit list:
4c4fd4d1b2a5b178915ac5970f86faab12998fcc
07ede8e6a24829ee810fdd60f2ea6696ddd0c793
a9ea0e8be55f8dd8459ddf099406b44402d2a190
d57ecb8b980c5a6ad2b68369750e592f6db4bd09

See #60

Author: imath

wp-includes/block-supports/aria-label.php

@@ -0,0 +1,73 @@
+<?php
+/**
+ * Aria label block support flag.
+ *
+ * @package Retraceur
+ * @since WP 6.8.0
+ * @since 2.0.0 Retraceur fork.
+ */
+
+/**
+ * Registers the aria-label block attribute for block types that support it.
+ *
+ * @since WP 6.8.0
+ * @since 2.0.0 Retraceur fork.
+ * @access private
+ *
+ * @param WP_Block_Type $block_type Block Type.
+ */
+function wp_register_aria_label_support( $block_type ) {
+	$has_aria_label_support = block_has_support( $block_type, array( 'ariaLabel' ), false );
+
+	if ( ! $has_aria_label_support ) {
+		return;
+	}
+
+	if ( ! $block_type->attributes ) {
+		$block_type->attributes = array();
+	}
+
+	if ( ! array_key_exists( 'ariaLabel', $block_type->attributes ) ) {
+		$block_type->attributes['ariaLabel'] = array(
+			'type' => 'string',
+		);
+	}
+}
+
+/**
+ * Add the aria-label to the output.
+ *
+ * @since WP 6.8.0
+ * @since 2.0.0 Retraceur fork.
+ * @access private
+ *
+ * @param WP_Block_Type $block_type       Block Type.
+ * @param array         $block_attributes Block attributes.
+ *
+ * @return array Block aria-label.
+ */
+function wp_apply_aria_label_support( $block_type, $block_attributes ) {
+	if ( ! $block_attributes ) {
+		return array();
+	}
+
+	$has_aria_label_support = block_has_support( $block_type, array( 'ariaLabel' ), false );
+	if ( ! $has_aria_label_support ) {
+		return array();
+	}
+
+	$has_aria_label = array_key_exists( 'ariaLabel', $block_attributes );
+	if ( ! $has_aria_label ) {
+		return array();
+	}
+	return array( 'aria-label' => $block_attributes['ariaLabel'] );
+}
+
+// Register the block support.
+WP_Block_Supports::get_instance()->register(
+	'aria-label',
+	array(
+		'register_attribute' => 'wp_register_aria_label_support',
+		'apply'              => 'wp_apply_aria_label_support',
+	)
+);

wp-includes/class-wp-block-supports.php

@@ -181,7 +181,7 @@ function get_block_wrapper_attributes( $extra_attributes = array() ) {
 
 	// This is hardcoded on purpose.
 	// We only support a fixed list of attributes.
-	$attributes_to_merge = array( 'style', 'class', 'id' );
+	$attributes_to_merge = array( 'style', 'class', 'id', 'aria-label' );
 	$attributes          = array();
 	foreach ( $attributes_to_merge as $attribute_name ) {
 		if ( empty( $new_attributes[ $attribute_name ] ) && empty( $extra_attributes[ $attribute_name ] ) ) {

wp-includes/class-wp-query.php

@@ -3491,14 +3491,28 @@ public function the_post() {
 		global $post;
 
 		if ( ! $this->in_the_loop ) {
-			// Only prime the post cache for queries limited to the ID field.
-			$post_ids = array_filter( $this->posts, 'is_numeric' );
-			// Exclude any falsey values, such as 0.
-			$post_ids = array_filter( $post_ids );
+			// Get post IDs to prime incomplete post objects.
+			$post_ids = array_reduce(
+				$this->posts,
+				function ( $carry, $post ) {
+					if ( is_numeric( $post ) && $post > 0 ) {
+						// Query for post ID.
+						$carry[] = $post;
+					}
+
+					if ( is_object( $post ) && isset( $post->ID ) ) {
+						// Query for object, either WP_Post or stdClass.
+						$carry[] = $post->ID;
+					}
+
+					return $carry;
+				},
+				array()
+			);
 			if ( $post_ids ) {
 				_prime_post_caches( $post_ids, $this->query_vars['update_post_term_cache'], $this->query_vars['update_post_meta_cache'] );
 			}
-			$post_objects = array_map( 'get_post', $this->posts );
+			$post_objects = array_map( 'get_post', $post_ids );
 			update_post_author_caches( $post_objects );
 		}
 
@@ -3517,6 +3531,16 @@ public function the_post() {
 		}
 
 		$post = $this->next_post();
+
+		// Get the post ID.
+		if ( is_object( $post ) ) {
+			$global_post_id = $post->ID;
+		} else {
+			$global_post_id = $post;
+		}
+
+		// Ensure the global $post is the full post object.
+		$post = get_post( $global_post_id );
 		$this->setup_postdata( $post );
 	}
 

wp-includes/rest-api/endpoints/class-wp-rest-edit-site-export-controller.php

@@ -55,7 +55,7 @@ public function register_routes() {
 	 * @return true|WP_Error True if the request has access, or WP_Error object.
 	 */
 	public function permissions_check() {
-		if ( current_user_can( 'edit_theme_options' ) ) {
+		if ( current_user_can( 'export' ) ) {
 			return true;
 		}
 

wp-includes/update.php

@@ -254,12 +254,6 @@ function wp_update_plugins( $extra_stats = array() ) {
 		$current = new stdClass();
 	}
 
-	$updates               = new stdClass();
-	$updates->last_checked = time();
-	$updates->response     = array();
-	$updates->translations = array();
-	$updates->no_update    = array();
-
 	$doing_cron = wp_doing_cron();
 
 	// Check for update on a different schedule, depending on the page.
@@ -288,8 +282,6 @@ function wp_update_plugins( $extra_stats = array() ) {
 		$plugin_changed = false;
 
 		foreach ( $plugins as $file => $p ) {
-			$updates->checked[ $file ] = $p['Version'];
-
 			if ( ! isset( $current->checked[ $file ] ) || (string) $current->checked[ $file ] !== (string) $p['Version'] ) {
 				$plugin_changed = true;
 			}
@@ -371,6 +363,15 @@ function wp_update_plugins( $extra_stats = array() ) {
 		return;
 	}
 
+	$updates               = new stdClass();
+	$updates->last_checked = time();
+	$updates->response     = array();
+	$updates->translations = array();
+	$updates->no_update    = array();
+	foreach ( $plugins as $file => $p ) {
+		$updates->checked[ $file ] = $p['Version'];
+	}
+
 	$response = json_decode( wp_remote_retrieve_body( $raw_response ), true );
 
 	if ( $response && is_array( $response ) ) {

wp-settings.php

@@ -371,6 +371,7 @@
 require ABSPATH . WPINC . '/block-supports/shadow.php';
 require ABSPATH . WPINC . '/block-supports/background.php';
 require ABSPATH . WPINC . '/block-supports/block-style-variations.php';
+require ABSPATH . WPINC . '/block-supports/aria-label.php';
 require ABSPATH . WPINC . '/style-engine.php';
 require ABSPATH . WPINC . '/style-engine/class-wp-style-engine.php';
 require ABSPATH . WPINC . '/style-engine/class-wp-style-engine-css-declarations.php';