Merge branch 'trunk' into patch-1

Author: GautamMKGarg

src/wp-admin/css/dashboard.css

@@ -72,6 +72,7 @@
 	outline-offset: -2px;
 	border-radius: 8px;
 	height: 250px;
+	margin: 4px;
 }
 
 /* Only highlight drop zones when dragging. */

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/ai-client/class-wp-ai-client-prompt-builder.php

@@ -165,7 +165,18 @@ class WP_AI_Client_Prompt_Builder {
 	 *                                                                                                    conversations. Default null.
 	 */
 	public function __construct( ProviderRegistry $registry, $prompt = null ) {
-		$this->builder = new PromptBuilder( $registry, $prompt );
+		try {
+			$this->builder = new PromptBuilder( $registry, $prompt );
+		} catch ( Exception $e ) {
+			$this->builder = new PromptBuilder( $registry );
+			$this->error   = new WP_Error(
+				'prompt_builder_error',
+				$e->getMessage(),
+				array(
+					'exception_class' => get_class( $e ),
+				)
+			);
+		}
 
 		/**
 		 * Filters the default request timeout in seconds for AI Client HTTP requests.

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;
 		}