Merge branch 'trunk' of https://github.com/WordPress/wordpress-develop into trac-64704

westonruter · westonruter · commit 5b89f6e15e9f · 2026-02-27T16:15:28.000-08:00
diff --git a/src/js/_enqueues/admin/common.js b/src/js/_enqueues/admin/common.js
@@ -1350,9 +1350,11 @@ $( function() {
 		event.stopPropagation();
 		$( 'html, body' ).animate( { scrollTop: 0 } );
 
-		var errorMessage = __( 'Please select at least one item to perform this action on.' );
+		var errorMessage = value !== '-1' ?
+			__( 'Please select at least one item to perform this action on.' ) :
+			__( 'Please select a bulk action to perform.' );
 		addAdminNotice( {
-			id: 'no-items-selected',
+			id: value !== '-1' ? 'no-items-selected' : 'no-bulk-action-selected',
 			type: 'error',
 			message: errorMessage,
 			dismissible: true,
diff --git a/src/wp-admin/css/site-icon.css b/src/wp-admin/css/site-icon.css
@@ -181,7 +181,7 @@
 button.reset.remove-site-icon {
 	color: var(--site-icon-removal);
 	text-decoration: none;
-	border-color: transparent;
+	border-color: currentColor;
 	box-shadow: none;
 	background: transparent;
 }
diff --git a/src/wp-admin/options-general.php b/src/wp-admin/options-general.php
@@ -202,7 +202,7 @@ class="<?php echo esc_attr( $classes_for_button ); ?>"
 		<button
 			id="js-remove-site-icon"
 			type="button"
-			<?php echo has_site_icon() ? 'class="button button-secondary reset remove-site-icon"' : 'class="button button-secondary reset hidden"'; ?>
+			<?php echo has_site_icon() ? 'class="button button-secondary reset remove-site-icon"' : 'class="button button-secondary reset remove-site-icon hidden"'; ?>
 		>
 			<?php _e( 'Remove Site Icon' ); ?>
 		</button>
diff --git a/src/wp-includes/Requests/src/IdnaEncoder.php b/src/wp-includes/Requests/src/IdnaEncoder.php
@@ -216,18 +216,18 @@ protected static function utf8_to_codepoints($input) {
 			}
 
 			if (// Non-shortest form sequences are invalid
-				$length > 1 && $character <= 0x7F
-				|| $length > 2 && $character <= 0x7FF
-				|| $length > 3 && $character <= 0xFFFF
+				($length > 1 && $character <= 0x7F)
+				|| ($length > 2 && $character <= 0x7FF)
+				|| ($length > 3 && $character <= 0xFFFF)
 				// Outside of range of ucschar codepoints
 				// Noncharacters
 				|| ($character & 0xFFFE) === 0xFFFE
-				|| $character >= 0xFDD0 && $character <= 0xFDEF
+				|| ($character >= 0xFDD0 && $character <= 0xFDEF)
 				|| (
 					// Everything else not in ucschar
-					$character > 0xD7FF && $character < 0xF900
+					($character > 0xD7FF && $character < 0xF900)
 					|| $character < 0x20
-					|| $character > 0x7E && $character < 0xA0
+					|| ($character > 0x7E && $character < 0xA0)
 					|| $character > 0xEFFFD
 				)
 			) {
diff --git a/src/wp-includes/Requests/src/Ipv6.php b/src/wp-includes/Requests/src/Ipv6.php
@@ -161,7 +161,7 @@ public static function check_ipv6($ip) {
 		list($ipv6, $ipv4) = self::split_v6_v4($ip);
 		$ipv6              = explode(':', $ipv6);
 		$ipv4              = explode('.', $ipv4);
-		if (count($ipv6) === 8 && count($ipv4) === 1 || count($ipv6) === 6 && count($ipv4) === 4) {
+		if ((count($ipv6) === 8 && count($ipv4) === 1) || (count($ipv6) === 6 && count($ipv4) === 4)) {
 			foreach ($ipv6 as $ipv6_part) {
 				// The section can't be empty
 				if ($ipv6_part === '') {
diff --git a/src/wp-includes/Requests/src/Iri.php b/src/wp-includes/Requests/src/Iri.php
@@ -214,7 +214,7 @@ public function __get($name) {
 			$return = null;
 		}
 
-		if ($return === null && isset($this->normalization[$this->scheme][$name])) {
+		if ($return === null && isset($this->scheme, $this->normalization[$this->scheme][$name])) {
 			return $this->normalization[$this->scheme][$name];
 		}
 		else {
@@ -669,27 +669,29 @@ protected function remove_iunreserved_percent_encoded($regex_match) {
 	}
 
 	protected function scheme_normalization() {
-		if (isset($this->normalization[$this->scheme]['iuserinfo']) && $this->iuserinfo === $this->normalization[$this->scheme]['iuserinfo']) {
-			$this->iuserinfo = null;
-		}
-		if (isset($this->normalization[$this->scheme]['ihost']) && $this->ihost === $this->normalization[$this->scheme]['ihost']) {
-			$this->ihost = null;
-		}
-		if (isset($this->normalization[$this->scheme]['port']) && $this->port === $this->normalization[$this->scheme]['port']) {
-			$this->port = null;
-		}
-		if (isset($this->normalization[$this->scheme]['ipath']) && $this->ipath === $this->normalization[$this->scheme]['ipath']) {
-			$this->ipath = '';
+		if (isset($this->scheme, $this->normalization[$this->scheme])) {
+			if (isset($this->normalization[$this->scheme]['iuserinfo']) && $this->iuserinfo === $this->normalization[$this->scheme]['iuserinfo']) {
+				$this->iuserinfo = null;
+			}
+			if (isset($this->normalization[$this->scheme]['ihost']) && $this->ihost === $this->normalization[$this->scheme]['ihost']) {
+				$this->ihost = null;
+			}
+			if (isset($this->normalization[$this->scheme]['port']) && $this->port === $this->normalization[$this->scheme]['port']) {
+				$this->port = null;
+			}
+			if (isset($this->normalization[$this->scheme]['ipath']) && $this->ipath === $this->normalization[$this->scheme]['ipath']) {
+				$this->ipath = '';
+			}
+			if (isset($this->normalization[$this->scheme]['iquery']) && $this->iquery === $this->normalization[$this->scheme]['iquery']) {
+				$this->iquery = null;
+			}
+			if (isset($this->normalization[$this->scheme]['ifragment']) && $this->ifragment === $this->normalization[$this->scheme]['ifragment']) {
+				$this->ifragment = null;
+			}
 		}
 		if (isset($this->ihost) && empty($this->ipath)) {
 			$this->ipath = '/';
 		}
-		if (isset($this->normalization[$this->scheme]['iquery']) && $this->iquery === $this->normalization[$this->scheme]['iquery']) {
-			$this->iquery = null;
-		}
-		if (isset($this->normalization[$this->scheme]['ifragment']) && $this->ifragment === $this->normalization[$this->scheme]['ifragment']) {
-			$this->ifragment = null;
-		}
 	}
 
 	/**
diff --git a/src/wp-includes/Requests/src/Requests.php b/src/wp-includes/Requests/src/Requests.php
@@ -148,7 +148,7 @@ class Requests {
 	 *
 	 * @var string
 	 */
-	const VERSION = '2.0.11';
+	const VERSION = '2.0.17';
 
 	/**
 	 * Selected transport name
diff --git a/src/wp-includes/Requests/src/Response/Headers.php b/src/wp-includes/Requests/src/Response/Headers.php
@@ -35,7 +35,7 @@ public function offsetGet($offset) {
 			$offset = strtolower($offset);
 		}
 
-		if (!isset($this->data[$offset])) {
+		if (!isset($offset, $this->data[$offset])) {
 			return null;
 		}
 
diff --git a/src/wp-includes/Requests/src/Transport/Curl.php b/src/wp-includes/Requests/src/Transport/Curl.php
@@ -126,6 +126,7 @@ public function __construct() {
 	 */
 	public function __destruct() {
 		if (is_resource($this->handle)) {
+			// phpcs:ignore PHPCompatibility.FunctionUse.RemovedFunctions.curl_closeDeprecated,Generic.PHP.DeprecatedFunctions.Deprecated
 			curl_close($this->handle);
 		}
 	}
@@ -306,7 +307,10 @@ public function request_multiple($requests, $options) {
 				}
 
 				curl_multi_remove_handle($multihandle, $done['handle']);
-				curl_close($done['handle']);
+				if (is_resource($done['handle'])) {
+					// phpcs:ignore PHPCompatibility.FunctionUse.RemovedFunctions.curl_closeDeprecated,Generic.PHP.DeprecatedFunctions.Deprecated
+					curl_close($done['handle']);
+				}
 
 				if (!is_string($responses[$key])) {
 					$options['hooks']->dispatch('multiple.request.complete', [&$responses[$key], $key]);
diff --git a/src/wp-includes/Requests/src/Transport/Fsockopen.php b/src/wp-includes/Requests/src/Transport/Fsockopen.php
@@ -148,9 +148,11 @@ public function request($url, $headers = [], $data = [], $options = []) {
 			// Ref: https://wiki.php.net/rfc/deprecate_functions_with_overloaded_signatures#stream_context_set_option
 			if (function_exists('stream_context_set_options')) {
 				// PHP 8.3+.
+				// phpcs:ignore PHPCompatibility.FunctionUse.NewFunctions.stream_context_set_optionsFound
 				stream_context_set_options($context, ['ssl' => $context_options]);
 			} else {
 				// PHP < 8.3.
+				// phpcs:ignore PHPCompatibility.FunctionUse.OptionalToRequiredFunctionParameters
 				stream_context_set_option($context, ['ssl' => $context_options]);
 			}
 		} else {
diff --git a/src/wp-includes/Requests/src/Utility/CaseInsensitiveDictionary.php b/src/wp-includes/Requests/src/Utility/CaseInsensitiveDictionary.php
@@ -49,6 +49,10 @@ public function offsetExists($offset) {
 			$offset = strtolower($offset);
 		}
 
+		if ($offset === null) {
+			$offset = '';
+		}
+
 		return isset($this->data[$offset]);
 	}
 
@@ -64,6 +68,10 @@ public function offsetGet($offset) {
 			$offset = strtolower($offset);
 		}
 
+		if ($offset === null) {
+			$offset = '';
+		}
+
 		if (!isset($this->data[$offset])) {
 			return null;
 		}
@@ -103,6 +111,10 @@ public function offsetUnset($offset) {
 			$offset = strtolower($offset);
 		}
 
+		if ($offset === null) {
+			$offset = '';
+		}
+
 		unset($this->data[$offset]);
 	}
 
diff --git a/src/wp-includes/Requests/src/Utility/FilteredIterator.php b/src/wp-includes/Requests/src/Utility/FilteredIterator.php
@@ -28,13 +28,13 @@ final class FilteredIterator extends ArrayIterator {
 	/**
 	 * Create a new iterator
 	 *
-	 * @param array    $data     The array or object to be iterated on.
+	 * @param array    $data     The array to be iterated on.
 	 * @param callable $callback Callback to be called on each value
 	 *
 	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $data argument is not iterable.
 	 */
 	public function __construct($data, $callback) {
-		if (InputValidator::is_iterable($data) === false) {
+		if (is_object($data) === true || InputValidator::is_iterable($data) === false) {
 			throw InvalidArgument::create(1, '$data', 'iterable', gettype($data));
 		}
 
diff --git a/src/wp-includes/ms-blogs.php b/src/wp-includes/ms-blogs.php
@@ -614,10 +614,28 @@ function wp_cache_switch_to_blog_fallback() {
 	$global_groups         = false;
 	$non_persistent_groups = false;
 
-	if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) ) {
-		$global_groups         = array_keys( $wp_object_cache->global_groups );
-		$all_groups            = array_fill_keys( array_keys( $wp_object_cache->cache ), true );
-		$non_persistent_groups = array_keys( array_diff_key( $all_groups, $wp_object_cache->global_groups ) );
+	if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) && is_array( $wp_object_cache->global_groups ) ) {
+
+		// Get the global groups as they are.
+		$group_names = $wp_object_cache->global_groups;
+
+		// Get global group keys if non-numeric array.
+		if ( ! wp_is_numeric_array( $group_names ) ) {
+			$group_names = array_keys( $group_names );
+		}
+
+		$global_groups = $group_names;
+
+		/*
+		 * Non-persistent groups: Check for no_mc_groups first (memcached drop-in).
+		 * Fall back to cache structure (default cache).
+		 */
+		if ( isset( $wp_object_cache->no_mc_groups ) && is_array( $wp_object_cache->no_mc_groups ) && ! empty( $wp_object_cache->no_mc_groups ) ) {
+			$non_persistent_groups = $wp_object_cache->no_mc_groups;
+		} elseif ( isset( $wp_object_cache->cache ) && is_array( $wp_object_cache->cache ) ) {
+			$all_groups            = array_keys( $wp_object_cache->cache );
+			$non_persistent_groups = array_values( array_diff( $all_groups, $global_groups ) );
+		}
 	}
 
 	wp_cache_init();
diff --git a/tests/phpunit/tests/multisite/wpCacheSwitchToBlogFallback.php b/tests/phpunit/tests/multisite/wpCacheSwitchToBlogFallback.php

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@`
`181`	`181`	`button.reset.remove-site-icon {`
`182`	`182`	`color: var(--site-icon-removal);`
`183`	`183`	`text-decoration: none;`
`184`		`- border-color: transparent;`
	`184`	`+ border-color: currentColor;`
`185`	`185`	`box-shadow: none;`
`186`	`186`	`background: transparent;`
`187`	`187`	`}`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ class="<?php echo esc_attr( $classes_for_button ); ?>"`
`202`	`202`	`<button`
`203`	`203`	`id="js-remove-site-icon"`
`204`	`204`	`type="button"`
`205`		`- <?php echo has_site_icon() ? 'class="button button-secondary reset remove-site-icon"' : 'class="button button-secondary reset hidden"'; ?>`
	`205`	`+ <?php echo has_site_icon() ? 'class="button button-secondary reset remove-site-icon"' : 'class="button button-secondary reset remove-site-icon hidden"'; ?>`
`206`	`206`	`>`
`207`	`207`	`<?php _e( 'Remove Site Icon' ); ?>`
`208`	`208`	`</button>`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ class Requests {`
`148`	`148`	`*`
`149`	`149`	`* @var string`
`150`	`150`	`*/`
`151`		`- const VERSION = '2.0.11';`
	`151`	`+ const VERSION = '2.0.17';`
`152`	`152`
`153`	`153`	`/**`
`154`	`154`	`* Selected transport name`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function offsetGet($offset) {`
`35`	`35`	`$offset = strtolower($offset);`
`36`	`36`	`}`
`37`	`37`
`38`		`- if (!isset($this->data[$offset])) {`
	`38`	`+ if (!isset($offset, $this->data[$offset])) {`
`39`	`39`	`return null;`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,7 @@ public function __construct() {`
`126`	`126`	`*/`
`127`	`127`	`public function __destruct() {`
`128`	`128`	`if (is_resource($this->handle)) {`
	`129`	`+ // phpcs:ignore PHPCompatibility.FunctionUse.RemovedFunctions.curl_closeDeprecated,Generic.PHP.DeprecatedFunctions.Deprecated`
`129`	`130`	`curl_close($this->handle);`
`130`	`131`	`}`
`131`	`132`	`}`
`@@ -306,7 +307,10 @@ public function request_multiple($requests, $options) {`
`306`	`307`	`}`
`307`	`308`
`308`	`309`	`curl_multi_remove_handle($multihandle, $done['handle']);`
`309`		`- curl_close($done['handle']);`
	`310`	`+ if (is_resource($done['handle'])) {`
	`311`	`+ // phpcs:ignore PHPCompatibility.FunctionUse.RemovedFunctions.curl_closeDeprecated,Generic.PHP.DeprecatedFunctions.Deprecated`
	`312`	`+ curl_close($done['handle']);`
	`313`	`+ }`
`310`	`314`
`311`	`315`	`if (!is_string($responses[$key])) {`
`312`	`316`	`$options['hooks']->dispatch('multiple.request.complete', [&$responses[$key], $key]);`