Merge branch 'trunk' into add-dimension-validation-to-sideload

Author: adamsilverstein

src/wp-admin/includes/class-wp-media-list-table.php

@@ -493,7 +493,7 @@ public function column_title( $post ) {
 				'<a href="%s">',
 				get_edit_post_link( $post->ID ),
 			);
-			$link_end = '</a>';
+			$link_end   = '</a>';
 		}
 
 		$class = $thumb ? ' class="has-media-icon"' : '';

src/wp-includes/author-template.php

@@ -334,7 +334,7 @@ function get_the_author_posts_link() {
 
 	$author = get_the_author();
 	/* translators: %s: Author's display name. */
-	$title  = sprintf( __( 'Posts by %s' ), $author );
+	$title = sprintf( __( 'Posts by %s' ), $author );
 
 	$link = sprintf(
 		'<a href="%1$s" rel="author">%2$s</a>',

src/wp-includes/class-wp-comment.php

@@ -210,7 +210,7 @@ public static function get_instance( $id ) {
 	 *
 	 * @since 4.4.0
 	 *
-	 * @param WP_Comment $comment Comment object.
+	 * @param object $comment Comment object.
 	 */
 	public function __construct( $comment ) {
 		foreach ( get_object_vars( $comment ) as $key => $value ) {

src/wp-includes/class-wp-post.php

@@ -260,7 +260,7 @@ public static function get_instance( $post_id ) {
 	 *
 	 * @since 3.5.0
 	 *
-	 * @param WP_Post|object $post Post object.
+	 * @param object $post Post object.
 	 */
 	public function __construct( $post ) {
 		foreach ( get_object_vars( $post ) as $key => $value ) {

src/wp-includes/class-wp-site.php

@@ -190,7 +190,7 @@ public static function get_instance( $site_id ) {
 	 *
 	 * @since 4.5.0
 	 *
-	 * @param WP_Site|object $site A site object.
+	 * @param object $site A site object.
 	 */
 	public function __construct( $site ) {
 		foreach ( get_object_vars( $site ) as $key => $value ) {

src/wp-includes/class-wp-term.php

@@ -192,7 +192,7 @@ public static function get_instance( $term_id, $taxonomy = null ) {
 	 *
 	 * @since 4.4.0
 	 *
-	 * @param WP_Term|object $term Term object.
+	 * @param object $term Term object.
 	 */
 	public function __construct( $term ) {
 		foreach ( get_object_vars( $term ) as $key => $value ) {

src/wp-includes/class-wp-user.php

@@ -121,9 +121,9 @@ class WP_User {
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
-	 * @param int|string|stdClass|WP_User $id      User's ID, a WP_User object, or a user object from the DB.
-	 * @param string                      $name    Optional. User's username
-	 * @param int                         $site_id Optional Site ID, defaults to current site.
+	 * @param int|string|object $id      User's ID, a WP_User object, or a user object from the DB.
+	 * @param string            $name    Optional. User's username
+	 * @param int               $site_id Optional Site ID, defaults to current site.
 	 */
 	public function __construct( $id = 0, $name = '', $site_id = 0 ) {
 		global $wpdb;

src/wp-includes/collaboration/class-wp-sync-post-meta-storage.php

@@ -85,7 +85,7 @@ public function add_update( string $room, $update ): bool {
 			'value'     => $update,
 		);
 
-		return (bool) add_post_meta( $post_id, self::SYNC_UPDATE_META_KEY, $envelope, false );
+		return (bool) add_post_meta( $post_id, wp_slash( self::SYNC_UPDATE_META_KEY ), wp_slash( $envelope ), false );
 	}
 
 	/**
@@ -162,7 +162,7 @@ public function set_awareness_state( string $room, array $awareness ): bool {
 		}
 
 		// update_post_meta returns false if the value is the same as the existing value.
-		update_post_meta( $post_id, self::AWARENESS_META_KEY, $awareness );
+		update_post_meta( $post_id, wp_slash( self::AWARENESS_META_KEY ), wp_slash( $awareness ) );
 		return true;
 	}
 
@@ -305,7 +305,7 @@ public function remove_updates_before_cursor( string $room, int $cursor ): bool
 		$all_updates = $this->get_all_updates( $room );
 
 		// Remove all updates for the room and re-store only those that are newer than the cursor.
-		if ( ! delete_post_meta( $post_id, self::SYNC_UPDATE_META_KEY ) ) {
+		if ( ! delete_post_meta( $post_id, wp_slash( self::SYNC_UPDATE_META_KEY ) ) ) {
 			return false;
 		}
 

src/wp-includes/post.php

@@ -1135,7 +1135,7 @@ function get_extended( $post ) {
  *
  * @global WP_Post $post Global post object.
  *
- * @param int|WP_Post|null $post   Optional. Post ID or post object. `null`, `false`, `0` and other PHP falsey values
+ * @param int|object|null  $post   Optional. Post ID or post object. `null`, `false`, `0` and other PHP falsey values
  *                                 return the current global post inside the loop. A numerically valid post ID that
  *                                 points to a non-existent post returns `null`. Defaults to global $post.
  * @param string           $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which
@@ -1159,8 +1159,10 @@ function get_post( $post = null, $output = OBJECT, $filter = 'raw' ) {
 			$_post = new WP_Post( $_post );
 		} elseif ( 'raw' === $post->filter ) {
 			$_post = new WP_Post( $post );
-		} else {
+		} elseif ( isset( $post->ID ) ) {
 			$_post = WP_Post::get_instance( $post->ID );
+		} else {
+			$_post = null;
 		}
 	} else {
 		$_post = WP_Post::get_instance( $post );

src/wp-includes/rest-api/class-wp-rest-server.php

@@ -1391,9 +1391,9 @@ public function get_index( $request ) {
 			/** This filter is documented in wp-includes/class-wp-image-editor-imagick.php */
 			$available['jpeg_interlaced'] = (bool) apply_filters( 'image_save_progressive', false, 'image/jpeg' );
 			/** This filter is documented in wp-includes/class-wp-image-editor-imagick.php */
-			$available['png_interlaced']  = (bool) apply_filters( 'image_save_progressive', false, 'image/png' );
+			$available['png_interlaced'] = (bool) apply_filters( 'image_save_progressive', false, 'image/png' );
 			/** This filter is documented in wp-includes/class-wp-image-editor-imagick.php */
-			$available['gif_interlaced']  = (bool) apply_filters( 'image_save_progressive', false, 'image/gif' );
+			$available['gif_interlaced'] = (bool) apply_filters( 'image_save_progressive', false, 'image/gif' );
 		}
 
 		$response = new WP_REST_Response( $available );