Merge branch 'trunk' into add/threads-oembed-provider

Author: pestevez

src/wp-admin/css/dashboard.css

@@ -570,7 +570,7 @@
 }
 
 .community-events ul {
-	background-color: #f6f7f7;
+	background-color: rgba(var(--wp-admin-theme-color--rgb),.08);
 	padding-left: 0;
 	padding-right: 0;
 	padding-bottom: 0;
@@ -582,15 +582,15 @@
 	color: #2c3338;
 }
 .community-events li:first-child {
-	border-top: 1px solid #f0f0f1;
+	border-top: 1px solid #e9e9ed;
 }
 
 .community-events li ~ li {
-	border-top: 1px solid #f0f0f1;
+	border-top: 1px solid #e9e9ed;
 }
 
 .community-events .activity-block.last {
-	border-bottom: 1px solid #f0f0f1;
+	border-bottom: 1px solid #e9e9ed;
 	padding-top: 0;
 	margin-top: -1px;
 }

src/wp-admin/includes/image.php

@@ -1088,11 +1088,16 @@ function wp_read_image_metadata( $file ) {
 function wp_get_image_alttext( $file ) {
 	$alt_text     = '';
 	$img_contents = file_get_contents( $file );
+
+	if ( false === $img_contents ) {
+		return $alt_text;
+	}
+
 	// Find the start and end positions of the XMP metadata.
 	$xmp_start = strpos( $img_contents, '<x:xmpmeta' );
 	$xmp_end   = strpos( $img_contents, '</x:xmpmeta>' );
 
-	if ( ! $xmp_start || ! $xmp_end ) {
+	if ( false === $xmp_start || false === $xmp_end ) {
 		// No XMP metadata found.
 		return $alt_text;
 	}

src/wp-admin/users.php

@@ -143,13 +143,18 @@
 				wp_die( __( 'Sorry, you are not allowed to edit this user.' ), 403 );
 			}
 
-			// The new role of the current user must also have the promote_users cap or be a multisite super admin.
-			if ( $id === $current_user->ID
-				&& ! $wp_roles->role_objects[ $role ]->has_cap( 'promote_users' )
-				&& ! ( is_multisite() && current_user_can( 'manage_network_users' ) )
-			) {
-					$update = 'err_admin_role';
+			// The new role of the current user must also have the promote_users cap, be a multisite super admin and must not be empty.
+			if ( $id === $current_user->ID ) {
+				if ( '' === $role ) {
+					wp_die( __( 'Sorry, you cannot remove your own role.' ), 403 );
+				}
+
+				if ( $wp_roles->role_objects[ $role ]->has_cap( 'promote_users' ) || ( is_multisite() && current_user_can( 'manage_network_users' ) ) ) {
 					continue;
+				}
+
+				$update = 'err_admin_role';
+				continue;
 			}
 
 			// If the user doesn't already belong to the blog, bail.

src/wp-includes/admin-bar.php

@@ -1437,3 +1437,49 @@ function _get_admin_bar_pref( $context = 'front', $user = 0 ) {
 
 	return 'true' === $pref;
 }
+
+/**
+ * Adds CSS from the administration color scheme stylesheet on the front end.
+ *
+ * @since 7.0.0
+ *
+ * @global array $_wp_admin_css_colors Registered administration color schemes.
+ */
+function wp_admin_bar_add_color_scheme_to_front_end() {
+	if ( is_admin() ) {
+		return;
+	}
+
+	global $_wp_admin_css_colors;
+
+	if ( empty( $_wp_admin_css_colors ) ) {
+		register_admin_color_schemes();
+	}
+
+	$color_scheme = get_user_option( 'admin_color' );
+
+	if ( empty( $color_scheme ) || ! isset( $_wp_admin_css_colors[ $color_scheme ] ) ) {
+		$color_scheme = 'modern';
+	}
+
+	$color = $_wp_admin_css_colors[ $color_scheme ] ?? null;
+	$url   = $color->url ?? '';
+
+	if ( $url ) {
+		$response = wp_remote_get( $url );
+		if ( ! is_wp_error( $response ) ) {
+			$css = $response['body'];
+			if ( is_string( $css ) && str_contains( $css, '#wpadminbar' ) ) {
+				$start_position = strpos( $css, '#wpadminbar' );
+				$end_position   = strpos( $css, '.wp-pointer' );
+				if ( false !== $end_position && $end_position > $start_position ) {
+					$css = substr( $css, $start_position, $end_position - $start_position );
+					if ( SCRIPT_DEBUG ) {
+						$css = str_replace( '/* Pointers */', '', $css );
+					}
+				}
+				wp_add_inline_style( 'admin-bar', $css );
+			}
+		}
+	}
+}

src/wp-includes/cache-compat.php

@@ -327,11 +327,11 @@ function wp_cache_set_multiple_salted( $data, $group, $salt, $expire = 0 ) {
 	 *
 	 * @param int $blog_id Site ID.
 	 */
-	function wp_cache_switch_to_blog( $blog_id ) {
+	function wp_cache_switch_to_blog( $blog_id ): void {
 		global $wp_object_cache;
 
 		// Attempt to use the drop-in object cache method if it exists.
-		if ( method_exists( $wp_object_cache, 'switch_to_blog' ) ) {
+		if ( is_object( $wp_object_cache ) && method_exists( $wp_object_cache, 'switch_to_blog' ) ) {
 			$wp_object_cache->switch_to_blog( $blog_id );
 			return;
 		}
@@ -340,6 +340,6 @@ function wp_cache_switch_to_blog( $blog_id ) {
 		 * Perform a fallback blog switch, which will reinitialize the caches
 		 * for the new blog ID.
 		 */
-		wp_cache_switch_to_blog_fallback( $blog_id );
+		wp_cache_switch_to_blog_fallback();
 	}
 endif;

src/wp-includes/class-avif-info.php

@@ -9,7 +9,7 @@
  * Media Patent License 1.0 was not distributed with this source code in the
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  *
- * Note: this class is from libavifinfo - https://aomedia.googlesource.com/libavifinfo/+/refs/heads/main/avifinfo.php at f509487.
+ * Note: this class is from libavifinfo - https://aomedia.googlesource.com/libavifinfo/+/refs/heads/main/avifinfo.php at 2b924de.
  * It is used as a fallback to parse AVIF files when the server doesn't support AVIF,
  * primarily to identify the width and height of the image.
  *
@@ -109,7 +109,7 @@ class Features {
   public $primary_item_id;
   public $primary_item_features = array( // Deduced from the data below.
     'width'        => UNDEFINED, // In number of pixels.
-    'height'       => UNDEFINED, // Ignores mirror and rotation.
+    'height'       => UNDEFINED, // Ignores crop and rotation.
     'bit_depth'    => UNDEFINED, // Likely 8, 10 or 12 bits per channel per pixel.
     'num_channels' => UNDEFINED  // Likely 1, 2, 3 or 4 channels:
                                           //   (1 monochrome or 3 colors) + (0 or 1 alpha)
@@ -256,6 +256,10 @@ public function parse( $handle, &$num_parsed_boxes, $num_remaining_bytes = MAX_S
       // Read the 32 least-significant bits.
       $this->size = read_big_endian( substr( $data, 4, 4 ), 4 );
     } else if ( $this->size == 0 ) {
+      // ISO/IEC 14496-12 4.2.2:
+      //   if size is 0, then this box shall be in a top-level box
+      //   (i.e. not contained in another box)
+      // Unfortunately the presence of a parent box is unknown here.
       $this->size = $num_remaining_bytes;
     }
     if ( $this->size < $header_size ) {
@@ -265,6 +269,9 @@ public function parse( $handle, &$num_parsed_boxes, $num_remaining_bytes = MAX_S
       return INVALID;
     }
 
+    // 16 bytes of usertype should be read here if the box type is 'uuid'.
+    // 'uuid' boxes are skipped so usertype is part of the skipped body.
+
     $has_fullbox_header = $this->type == 'meta' || $this->type == 'pitm' ||
                           $this->type == 'ipma' || $this->type == 'ispe' ||
                           $this->type == 'pixi' || $this->type == 'iref' ||
@@ -302,7 +309,7 @@ public function parse( $handle, &$num_parsed_boxes, $num_remaining_bytes = MAX_S
                      ( $this->type == 'auxC' && $this->version <= 0 );
       // Instead of considering this file as invalid, skip unparsable boxes.
       if ( !$is_parsable ) {
-        $this->type = 'unknownversion';
+        $this->type = 'skip'; // FreeSpaceBox. To be ignored by readers.
       }
     }
     // print_r( $this ); // Uncomment to print all boxes.
@@ -483,7 +490,7 @@ private function parse_ipco( $num_remaining_bytes ) {
   /**
    * Parses an "iprp" box.
    *
-   * The "ipco" box contain the properties which are linked to items by the "ipma" box.
+   * The "ipco" box contains the properties which are linked to items by the "ipma" box.
    *
    * @param stream  $handle              The resource the box will be parsed from.
    * @param int     $num_remaining_bytes The number of bytes that should be available from the resource.
@@ -596,7 +603,7 @@ private function parse_iprp( $num_remaining_bytes ) {
    * @return Status                      FOUND on success or an error on failure.
    */
   private function parse_iref( $num_remaining_bytes ) {
-    do {
+    while ( $num_remaining_bytes > 0 ) {
       $box    = new Box();
       $status = $box->parse( $this->handle, $this->num_parsed_boxes, $num_remaining_bytes );
       if ( $status != FOUND ) {
@@ -656,7 +663,7 @@ private function parse_iref( $num_remaining_bytes ) {
         }
       }
       $num_remaining_bytes -= $box->size;
-    } while ( $num_remaining_bytes > 0 );
+    }
     return NOT_FOUND;
   }
 

src/wp-includes/class-wp-connector-registry.php

@@ -1,8 +1,6 @@
 <?php
 /**
- * Connectors API
- *
- * Defines WP_Connector_Registry class.
+ * Connectors API: WP_Connector_Registry class.
  *
  * @package WordPress
  * @subpackage Connectors
@@ -12,9 +10,23 @@
 /**
  * Manages the registration and lookup of connectors.
  *
+ * This is an internal class. Use the public API functions to interact with connectors:
+ *
+ *  - `wp_is_connector_registered()` — check if a connector exists.
+ *  - `wp_get_connector()`           — retrieve a single connector's data.
+ *  - `wp_get_connectors()`          — retrieve all registered connectors.
+ *
+ * Plugins receive the registry instance via the `wp_connectors_init` action
+ * to register or override connectors directly.
+ *
  * @since 7.0.0
  * @access private
  *
+ * @see wp_is_connector_registered()
+ * @see wp_get_connector()
+ * @see wp_get_connectors()
+ * @see _wp_connectors_init()
+ *
  * @phpstan-type Connector array{
  *     name: non-empty-string,
  *     description: non-empty-string,
@@ -53,10 +65,22 @@ final class WP_Connector_Registry {
 	/**
 	 * Registers a new connector.
 	 *
+	 * Validates the provided arguments and stores the connector in the registry.
+	 * For connectors with `api_key` authentication, a `setting_name` is automatically
+	 * generated using the pattern `connectors_ai_{$id}_api_key` (e.g., connector ID
+	 * `openai` produces `connectors_ai_openai_api_key`). This setting name is used
+	 * for the Settings API registration and REST API exposure.
+	 *
+	 * Registering a connector with an ID that is already registered will trigger a
+	 * `_doing_it_wrong()` notice and return `null`. To override an existing connector,
+	 * call `unregister()` first.
+	 *
 	 * @since 7.0.0
 	 *
-	 * @param string $id   The unique connector identifier. Must contain only lowercase
-	 *                     alphanumeric characters and underscores.
+	 * @see WP_Connector_Registry::unregister()
+	 *
+	 * @param string $id   The unique connector identifier. Must match the pattern
+	 *                     `/^[a-z0-9_]+$/` (lowercase alphanumeric and underscores only).
 	 * @param array  $args {
 	 *     An associative array of arguments for the connector.
 	 *
@@ -175,8 +199,17 @@ public function register( string $id, array $args ): ?array {
 	/**
 	 * Unregisters a connector.
 	 *
+	 * Returns the connector data on success, which can be modified and passed
+	 * back to `register()` to override a connector's metadata.
+	 *
+	 * Triggers a `_doing_it_wrong()` notice if the connector is not registered.
+	 * Use `is_registered()` to check first when the connector may not exist.
+	 *
 	 * @since 7.0.0
 	 *
+	 * @see WP_Connector_Registry::register()
+	 * @see WP_Connector_Registry::is_registered()
+	 *
 	 * @param string $id The connector identifier.
 	 * @return array|null The unregistered connector data on success, null on failure.
 	 *
@@ -237,6 +270,9 @@ public function is_registered( string $id ): bool {
 	 *
 	 * Do not use this method directly. Instead, use the `wp_get_connector()` function.
 	 *
+	 * Triggers a `_doing_it_wrong()` notice if the connector is not registered.
+	 * Use `is_registered()` to check first when the connector may not exist.
+	 *
 	 * @since 7.0.0
 	 *
 	 * @see wp_get_connector()
@@ -272,9 +308,14 @@ public static function get_instance(): ?self {
 	/**
 	 * Sets the main instance of the registry class.
 	 *
+	 * Called by `_wp_connectors_init()` during the `init` action. Must not be
+	 * called outside of that context.
+	 *
 	 * @since 7.0.0
 	 * @access private
 	 *
+	 * @see _wp_connectors_init()
+	 *
 	 * @param WP_Connector_Registry $registry The registry instance.
 	 */
 	public static function set_instance( WP_Connector_Registry $registry ): void {