Merge branch 'release/2.3.1'

ClassicPress · Dec 12, 2024 · 77ae50e · 77ae50e
2 parents eb672aa + b940b47
commit 77ae50e
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 9 deletions.
diff --git a/wp-admin/js/common.js b/wp-admin/js/common.js
@@ -1080,7 +1080,7 @@ $( function() {
 			 * @return {void}
 			 */
 		}).find( 'li.wp-has-submenu.wp-not-current-submenu' ).on( 'focusin.adminmenu', function() {
-			adjustSubmenu( $( this ) );
+			adjustSubmenu( $( this )[0] );
 		});
 	}
 

diff --git a/wp-admin/js/common.min.js b/wp-admin/js/common.min.js
diff --git a/wp-includes/js/dist/a11y.js b/wp-includes/js/dist/a11y.js
@@ -123,6 +123,7 @@ function validateHookName(hookName) {
 /* harmony default export */ var build_module_validateHookName = (validateHookName);
 
 ;// ./node_modules/@wordpress/hooks/build-module/createAddHook.js
+/* wp:polyfill */
 /**
  * Internal dependencies
  */
@@ -217,6 +218,7 @@ function createAddHook(hooks, storeKey) {
 /* harmony default export */ var build_module_createAddHook = (createAddHook);
 
 ;// ./node_modules/@wordpress/hooks/build-module/createRemoveHook.js
+/* wp:polyfill */
 /**
  * Internal dependencies
  */
@@ -297,6 +299,7 @@ function createRemoveHook(hooks, storeKey, removeAll = false) {
 /* harmony default export */ var build_module_createRemoveHook = (createRemoveHook);
 
 ;// ./node_modules/@wordpress/hooks/build-module/createHasHook.js
+/* wp:polyfill */
 /**
  * @callback HasHook
  *
@@ -426,6 +429,7 @@ function createCurrentHook(hooks, storeKey) {
 /* harmony default export */ var build_module_createCurrentHook = (createCurrentHook);
 
 ;// ./node_modules/@wordpress/hooks/build-module/createDoingHook.js
+/* wp:polyfill */
 /**
  * @callback DoingHook
  * Returns whether a hook is currently being executed.
@@ -498,7 +502,6 @@ function createDidHook(hooks, storeKey) {
 /* harmony default export */ var build_module_createDidHook = (createDidHook);
 
 ;// ./node_modules/@wordpress/hooks/build-module/createHooks.js
-/* wp:polyfill */
 /**
  * Internal dependencies
  */

diff --git a/wp-includes/js/dist/api-fetch.js b/wp-includes/js/dist/api-fetch.js
@@ -68,6 +68,7 @@ function validateHookName(hookName) {
 /* harmony default export */ var build_module_validateHookName = (validateHookName);
 
 ;// ./node_modules/@wordpress/hooks/build-module/createAddHook.js
+/* wp:polyfill */
 /**
  * Internal dependencies
  */
@@ -162,6 +163,7 @@ function createAddHook(hooks, storeKey) {
 /* harmony default export */ var build_module_createAddHook = (createAddHook);
 
 ;// ./node_modules/@wordpress/hooks/build-module/createRemoveHook.js
+/* wp:polyfill */
 /**
  * Internal dependencies
  */
@@ -242,6 +244,7 @@ function createRemoveHook(hooks, storeKey, removeAll = false) {
 /* harmony default export */ var build_module_createRemoveHook = (createRemoveHook);
 
 ;// ./node_modules/@wordpress/hooks/build-module/createHasHook.js
+/* wp:polyfill */
 /**
  * @callback HasHook
  *
@@ -371,6 +374,7 @@ function createCurrentHook(hooks, storeKey) {
 /* harmony default export */ var build_module_createCurrentHook = (createCurrentHook);
 
 ;// ./node_modules/@wordpress/hooks/build-module/createDoingHook.js
+/* wp:polyfill */
 /**
  * @callback DoingHook
  * Returns whether a hook is currently being executed.
@@ -443,7 +447,6 @@ function createDidHook(hooks, storeKey) {
 /* harmony default export */ var build_module_createDidHook = (createDidHook);
 
 ;// ./node_modules/@wordpress/hooks/build-module/createHooks.js
-/* wp:polyfill */
 /**
  * Internal dependencies
  */
@@ -2256,6 +2259,7 @@ const createRootURLMiddleware = rootURL => (options, next) => {
 /* harmony default export */ var root_url = (createRootURLMiddleware);
 
 ;// ./node_modules/@wordpress/url/build-module/normalize-path.js
+/* wp:polyfill */
 /**
  * Given a path, returns a normalized path where equal query parameter values
  * will be treated as identical, regardless of order they appear in the original
@@ -2333,6 +2337,7 @@ function getQueryString(url) {
 }
 
 ;// ./node_modules/@wordpress/url/build-module/get-query-args.js
+/* wp:polyfill */
 /**
  * Internal dependencies
  */
@@ -2421,6 +2426,7 @@ function getQueryArgs(url) {
 }
 
 ;// ./node_modules/@wordpress/url/build-module/build-query-string.js
+/* wp:polyfill */
 /**
  * Generates URL-encoded query string using input query data.
  *
@@ -2520,6 +2526,7 @@ function addQueryArgs(url = '', args) {
 }
 
 ;// ./node_modules/@wordpress/api-fetch/build-module/middlewares/preloading.js
+/* wp:polyfill */
 /**
  * WordPress dependencies
  */
@@ -2711,7 +2718,6 @@ const fetchAllMiddleware = async (options, next) => {
 /* harmony default export */ var fetch_all_middleware = (fetchAllMiddleware);
 
 ;// ./node_modules/@wordpress/api-fetch/build-module/middlewares/http-v1.js
-/* wp:polyfill */
 /**
  * Set of HTTP methods which are eligible to be overridden.
  *
@@ -2993,6 +2999,7 @@ const mediaUploadMiddleware = (options, next) => {
 /* harmony default export */ var media_upload = (mediaUploadMiddleware);
 
 ;// ./node_modules/@wordpress/url/build-module/remove-query-args.js
+/* wp:polyfill */
 /**
  * Internal dependencies
  */

diff --git a/wp-includes/js/dist/hooks.js b/wp-includes/js/dist/hooks.js
@@ -118,6 +118,7 @@ function validateHookName(hookName) {
 /* harmony default export */ var build_module_validateHookName = (validateHookName);
 
 ;// ./node_modules/@wordpress/hooks/build-module/createAddHook.js
+/* wp:polyfill */
 /**
  * Internal dependencies
  */
@@ -212,6 +213,7 @@ function createAddHook(hooks, storeKey) {
 /* harmony default export */ var build_module_createAddHook = (createAddHook);
 
 ;// ./node_modules/@wordpress/hooks/build-module/createRemoveHook.js
+/* wp:polyfill */
 /**
  * Internal dependencies
  */
@@ -292,6 +294,7 @@ function createRemoveHook(hooks, storeKey, removeAll = false) {
 /* harmony default export */ var build_module_createRemoveHook = (createRemoveHook);
 
 ;// ./node_modules/@wordpress/hooks/build-module/createHasHook.js
+/* wp:polyfill */
 /**
  * @callback HasHook
  *
@@ -421,6 +424,7 @@ function createCurrentHook(hooks, storeKey) {
 /* harmony default export */ var build_module_createCurrentHook = (createCurrentHook);
 
 ;// ./node_modules/@wordpress/hooks/build-module/createDoingHook.js
+/* wp:polyfill */
 /**
  * @callback DoingHook
  * Returns whether a hook is currently being executed.
@@ -493,7 +497,6 @@ function createDidHook(hooks, storeKey) {
 /* harmony default export */ var build_module_createDidHook = (createDidHook);
 
 ;// ./node_modules/@wordpress/hooks/build-module/createHooks.js
-/* wp:polyfill */
 /**
  * Internal dependencies
  */

diff --git a/wp-includes/js/dist/i18n.js b/wp-includes/js/dist/i18n.js
@@ -68,6 +68,7 @@ function validateHookName(hookName) {
 /* harmony default export */ var build_module_validateHookName = (validateHookName);
 
 ;// ./node_modules/@wordpress/hooks/build-module/createAddHook.js
+/* wp:polyfill */
 /**
  * Internal dependencies
  */
@@ -162,6 +163,7 @@ function createAddHook(hooks, storeKey) {
 /* harmony default export */ var build_module_createAddHook = (createAddHook);
 
 ;// ./node_modules/@wordpress/hooks/build-module/createRemoveHook.js
+/* wp:polyfill */
 /**
  * Internal dependencies
  */
@@ -242,6 +244,7 @@ function createRemoveHook(hooks, storeKey, removeAll = false) {
 /* harmony default export */ var build_module_createRemoveHook = (createRemoveHook);
 
 ;// ./node_modules/@wordpress/hooks/build-module/createHasHook.js
+/* wp:polyfill */
 /**
  * @callback HasHook
  *
@@ -371,6 +374,7 @@ function createCurrentHook(hooks, storeKey) {
 /* harmony default export */ var build_module_createCurrentHook = (createCurrentHook);
 
 ;// ./node_modules/@wordpress/hooks/build-module/createDoingHook.js
+/* wp:polyfill */
 /**
  * @callback DoingHook
  * Returns whether a hook is currently being executed.
@@ -443,7 +447,6 @@ function createDidHook(hooks, storeKey) {
 /* harmony default export */ var build_module_createDidHook = (createDidHook);
 
 ;// ./node_modules/@wordpress/hooks/build-module/createHooks.js
-/* wp:polyfill */
 /**
  * Internal dependencies
  */

diff --git a/wp-includes/js/dist/url.js b/wp-includes/js/dist/url.js
@@ -815,6 +815,7 @@ function getQueryString(url) {
 }
 
 ;// ./node_modules/@wordpress/url/build-module/build-query-string.js
+/* wp:polyfill */
 /**
  * Generates URL-encoded query string using input query data.
  *
@@ -984,6 +985,7 @@ function safeDecodeURIComponent(uriComponent) {
 }
 
 ;// ./node_modules/@wordpress/url/build-module/get-query-args.js
+/* wp:polyfill */
 /**
  * Internal dependencies
  */
@@ -1168,6 +1170,7 @@ function hasQueryArg(url, arg) {
 }
 
 ;// ./node_modules/@wordpress/url/build-module/remove-query-args.js
+/* wp:polyfill */
 /**
  * Internal dependencies
  */
@@ -1371,6 +1374,7 @@ function getFilename(url) {
 }
 
 ;// ./node_modules/@wordpress/url/build-module/normalize-path.js
+/* wp:polyfill */
 /**
  * Given a path, returns a normalized path where equal query parameter values
  * will be treated as identical, regardless of order they appear in the original

diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
@@ -53,7 +53,7 @@ function classicpress_asset_version( $type = 'script', $handle = null ) {
 	static $default_version;
 
 	if ( empty( $default_version ) ) {
-		$default_version = 'cp_b65fdc6f';
+		$default_version = 'cp_9fc9207f';
 	}
 
 	/**

diff --git a/wp-includes/version.php b/wp-includes/version.php
@@ -27,7 +27,7 @@
  *
  * @global string $cp_version
  */
-$cp_version = '2.3.0';
+$cp_version = '2.3.1';
 
 /**
  * The WordPress version string.