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

Author: westonruter

src/wp-content/themes/twentynineteen/sass/navigation/_menu-main-navigation.scss

@@ -433,9 +433,13 @@
 			white-space: inherit;
 		}
 
+		&:not(:has(.sub-menu.expanded-true)) {
+			overflow-y: scroll;
+		}
+
 		&.expanded-true {
 
-			display: table;
+			display: block;
 			margin-top: 0;
 			opacity: 1;
 			padding-left: 0;

src/wp-content/themes/twentynineteen/style-rtl.css

@@ -3271,8 +3271,12 @@ body.page .main-navigation {
   white-space: inherit;
 }
 
+.main-navigation .main-menu .menu-item-has-children.off-canvas .sub-menu:not(:has(.sub-menu.expanded-true)) {
+  overflow-y: scroll;
+}
+
 .main-navigation .main-menu .menu-item-has-children.off-canvas .sub-menu.expanded-true {
-  display: table;
+  display: block;
   margin-top: 0;
   opacity: 1;
   padding-right: 0;

src/wp-content/themes/twentynineteen/style.css

@@ -3271,8 +3271,12 @@ body.page .main-navigation {
   white-space: inherit;
 }
 
+.main-navigation .main-menu .menu-item-has-children.off-canvas .sub-menu:not(:has(.sub-menu.expanded-true)) {
+  overflow-y: scroll;
+}
+
 .main-navigation .main-menu .menu-item-has-children.off-canvas .sub-menu.expanded-true {
-  display: table;
+  display: block;
   margin-top: 0;
   opacity: 1;
   padding-left: 0;

src/wp-includes/author-template.php

@@ -286,7 +286,7 @@ function get_the_author_posts() {
 	if ( ! $post ) {
 		return 0;
 	}
-	return count_user_posts( $post->post_author, $post->post_type );
+	return (int) count_user_posts( $post->post_author, $post->post_type );
 }
 
 /**

src/wp-includes/capabilities.php

@@ -470,7 +470,7 @@ function map_meta_cap( $cap, $user_id, ...$args ) {
 			if ( $meta_key ) {
 				$allowed = ! is_protected_meta( $meta_key, $object_type );
 
-				if ( ! empty( $object_subtype ) && has_filter( "auth_{$object_type}_meta_{$meta_key}_for_{$object_subtype}" ) ) {
+				if ( has_filter( "auth_{$object_type}_meta_{$meta_key}_for_{$object_subtype}" ) ) {
 
 					/**
 					 * Filters whether the user is allowed to edit a specific meta key of a specific object type and subtype.
@@ -512,36 +512,33 @@ function map_meta_cap( $cap, $user_id, ...$args ) {
 					$allowed = apply_filters( "auth_{$object_type}_meta_{$meta_key}", $allowed, $meta_key, $object_id, $user_id, $cap, $caps );
 				}
 
-				if ( ! empty( $object_subtype ) ) {
-
-					/**
-					 * Filters whether the user is allowed to edit meta for specific object types/subtypes.
-					 *
-					 * Return true to have the mapped meta caps from `edit_{$object_type}` apply.
-					 *
-					 * The dynamic portion of the hook name, `$object_type` refers to the object type being filtered.
-					 * The dynamic portion of the hook name, `$object_subtype` refers to the object subtype being filtered.
-					 * The dynamic portion of the hook name, `$meta_key`, refers to the meta key passed to map_meta_cap().
-					 *
-					 * @since 4.6.0 As `auth_post_{$post_type}_meta_{$meta_key}`.
-					 * @since 4.7.0 Renamed from `auth_post_{$post_type}_meta_{$meta_key}` to
-					 *              `auth_{$object_type}_{$object_subtype}_meta_{$meta_key}`.
-					 * @deprecated 4.9.8 Use {@see 'auth_{$object_type}_meta_{$meta_key}_for_{$object_subtype}'} instead.
-					 *
-					 * @param bool     $allowed   Whether the user can add the object meta. Default false.
-					 * @param string   $meta_key  The meta key.
-					 * @param int      $object_id Object ID.
-					 * @param int      $user_id   User ID.
-					 * @param string   $cap       Capability name.
-					 * @param string[] $caps      Array of the user's capabilities.
-					 */
-					$allowed = apply_filters_deprecated(
-						"auth_{$object_type}_{$object_subtype}_meta_{$meta_key}",
-						array( $allowed, $meta_key, $object_id, $user_id, $cap, $caps ),
-						'4.9.8',
-						"auth_{$object_type}_meta_{$meta_key}_for_{$object_subtype}"
-					);
-				}
+				/**
+				 * Filters whether the user is allowed to edit meta for specific object types/subtypes.
+				 *
+				 * Return true to have the mapped meta caps from `edit_{$object_type}` apply.
+				 *
+				 * The dynamic portion of the hook name, `$object_type` refers to the object type being filtered.
+				 * The dynamic portion of the hook name, `$object_subtype` refers to the object subtype being filtered.
+				 * The dynamic portion of the hook name, `$meta_key`, refers to the meta key passed to map_meta_cap().
+				 *
+				 * @since 4.6.0 As `auth_post_{$post_type}_meta_{$meta_key}`.
+				 * @since 4.7.0 Renamed from `auth_post_{$post_type}_meta_{$meta_key}` to
+				 *              `auth_{$object_type}_{$object_subtype}_meta_{$meta_key}`.
+				 * @deprecated 4.9.8 Use {@see 'auth_{$object_type}_meta_{$meta_key}_for_{$object_subtype}'} instead.
+				 *
+				 * @param bool     $allowed   Whether the user can add the object meta. Default false.
+				 * @param string   $meta_key  The meta key.
+				 * @param int      $object_id Object ID.
+				 * @param int      $user_id   User ID.
+				 * @param string   $cap       Capability name.
+				 * @param string[] $caps      Array of the user's capabilities.
+				 */
+				$allowed = apply_filters_deprecated(
+					"auth_{$object_type}_{$object_subtype}_meta_{$meta_key}",
+					array( $allowed, $meta_key, $object_id, $user_id, $cap, $caps ),
+					'4.9.8',
+					"auth_{$object_type}_meta_{$meta_key}_for_{$object_subtype}"
+				);
 
 				if ( ! $allowed ) {
 					$caps[] = $cap;

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

@@ -305,7 +305,7 @@ protected function update_size( $width = null, $height = null ) {
 	 *    image operations within the time of the HTTP request.
 	 *
 	 * @since 6.2.0
-	 * @since 6.3.0 This method was deprecated.
+	 * @deprecated 6.3.0 No longer used in core.
 	 *
 	 * @return int|null The new limit on success, null on failure.
 	 */

src/wp-includes/pluggable.php

@@ -2676,9 +2676,11 @@ function wp_hash_password(
 		 * - `PASSWORD_ARGON2ID`
 		 * - `PASSWORD_DEFAULT`
 		 *
+		 * The values of the algorithm constants are strings in PHP 7.4+ and integers in PHP 7.3 and earlier.
+		 *
 		 * @since 6.8.0
 		 *
-		 * @param string $algorithm The hashing algorithm. Default is the value of the `PASSWORD_BCRYPT` constant.
+		 * @param string|int $algorithm The hashing algorithm. Default is the value of the `PASSWORD_BCRYPT` constant.
 		 */
 		$algorithm = apply_filters( 'wp_hash_password_algorithm', PASSWORD_BCRYPT );
 
@@ -2688,12 +2690,14 @@ function wp_hash_password(
 		 * The default hashing algorithm is bcrypt, but this can be changed via the {@see 'wp_hash_password_algorithm'}
 		 * filter. You must ensure that the options are appropriate for the algorithm in use.
 		 *
+		 * The values of the algorithm constants are strings in PHP 7.4+ and integers in PHP 7.3 and earlier.
+		 *
 		 * @since 6.8.0
 		 *
-		 * @param array $options    Array of options to pass to the password hashing functions.
-		 *                          By default this is an empty array which means the default
-		 *                          options will be used.
-		 * @param string $algorithm The hashing algorithm in use.
+		 * @param array      $options   Array of options to pass to the password hashing functions.
+		 *                              By default this is an empty array which means the default
+		 *                              options will be used.
+		 * @param string|int $algorithm The hashing algorithm in use.
 		 */
 		$options = apply_filters( 'wp_hash_password_options', array(), $algorithm );
 

src/wp-includes/post.php

@@ -4874,6 +4874,15 @@ function wp_insert_post( $postarr, $wp_error = false, $fire_after_hooks = true )
 			}
 		}
 
+		/**
+		 * Fires immediately before a new post is inserted in the database.
+		 *
+		 * @since 6.9.0
+		 *
+		 * @param array $data Array of unslashed post data.
+		 */
+		do_action( 'pre_post_insert', $data );
+
 		if ( false === $wpdb->insert( $wpdb->posts, $data ) ) {
 			if ( $wp_error ) {
 				if ( 'attachment' === $post_type ) {
@@ -6868,7 +6877,9 @@ function wp_get_attachment_metadata( $attachment_id = 0, $unfiltered = false ) {
  *
  * @param int   $attachment_id Attachment post ID.
  * @param array $data          Attachment meta data.
- * @return int|false False if $post is invalid.
+ * @return int|bool Whether the metadata was successfully updated.
+ *                  True on success, the Meta ID if the key didn't exist.
+ *                  False if $post is invalid, on failure, or if $data is the same as the existing metadata.
  */
 function wp_update_attachment_metadata( $attachment_id, $data ) {
 	$attachment_id = (int) $attachment_id;

src/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php

@@ -147,6 +147,18 @@ public function update_item( $request ) {
 
 		$params = $request->get_params();
 
+		if ( empty( $params ) || ! empty( array_diff_key( $params, $options ) ) ) {
+			$message = empty( $params )
+				? __( 'Request body cannot be empty.' )
+				: __( 'Invalid parameter(s) provided.' );
+
+			return new WP_Error(
+				'rest_invalid_param',
+				$message,
+				array( 'status' => 400 )
+			);
+		}
+
 		foreach ( $options as $name => $args ) {
 			if ( ! array_key_exists( $name, $params ) ) {
 				continue;

src/wp-includes/user.php

@@ -637,7 +637,7 @@ function count_user_posts( $userid, $post_type = 'post', $public_only = false )
 	 * @since 4.1.0 Added `$post_type` argument.
 	 * @since 4.3.1 Added `$public_only` argument.
 	 *
-	 * @param int          $count       The user's post count.
+	 * @param string       $count       The user's post count as a numeric string.
 	 * @param int          $userid      User ID.
 	 * @param string|array $post_type   Single post type or array of post types to count the number of posts for.
 	 * @param bool         $public_only Whether to limit counted posts to public posts.