Ticket #39092: 39092.diff

src/wp-admin/includes/post.php

@@ -1155 +1155 @@
 }
 
 /**
- * Filter the SQL clauses of an attachment query to include filenames.
- *
- * @since 4.7.0
- * @access private
- *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
- * @param array $clauses An array including WHERE, GROUP BY, JOIN, ORDER BY,
- *                       DISTINCT, fields (SELECT), and LIMITS clauses.
- * @return array The modified clauses.
- */
-function _filter_query_attachment_filenames( $clauses ) {
-        global $wpdb;
-        remove_filter( 'posts_clauses', __FUNCTION__ );
-
-        // Add a LEFT JOIN of the postmeta table so we don't trample existing JOINs.
-        $clauses['join'] .= " LEFT JOIN {$wpdb->postmeta} AS sq1 ON ( {$wpdb->posts}.ID = sq1.post_id AND sq1.meta_key = '_wp_attached_file' )";
-
-        $clauses['groupby'] = "{$wpdb->posts}.ID";
-
-        $clauses['where'] = preg_replace(
-                "/\({$wpdb->posts}.post_content (NOT LIKE|LIKE) (\'[^']+\')\)/",
-                "$0 OR ( sq1.meta_value $1 $2 )",
-                $clauses['where'] );
-
-        return $clauses;
-}
-
-/**
  * Executes a query for attachments. An array of WP_Query arguments
  * can be passed in, which will override the arguments set by this function.
  *

src/wp-includes/post.php

@@ -6183 +6183 @@
         clean_post_cache( $post->ID );
         return $post_name;
 }
+
+/**
+ * Filter the SQL clauses of an attachment query to include meta (filename/alt).
+ *
+ * @since 4.7.0
+ * @access private
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param array $clauses An array including WHERE, GROUP BY, JOIN, ORDER BY,
+ *                       DISTINCT, fields (SELECT), and LIMITS clauses.
+ * @return array The modified clauses.
+ */
+function _filter_query_attachment_filenames( $clauses ) {
+        global $wpdb;
+        remove_filter( 'posts_clauses', __FUNCTION__ );
+
+        // Add a LEFT JOIN of the postmeta table so we don't trample existing JOINs.
+        $clauses['join'] .= " LEFT JOIN {$wpdb->postmeta} AS sq1 ON ( {$wpdb->posts}.ID = sq1.post_id AND ( sq1.meta_key = '_wp_attached_file' OR sq1.meta_key = '_wp_attachment_image_alt'  ) )";
+
+        $clauses['groupby'] = "{$wpdb->posts}.ID";
+
+        $clauses['where'] = preg_replace(
+                "/\({$wpdb->posts}.post_content (NOT LIKE|LIKE) (\'[^']+\')\)/",
+                "$0 OR ( sq1.meta_value $1 $2 )",
+                $clauses['where'] );
+
+        return $clauses;
+}

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

@@ -275 +275 @@
                         }
                 }
 
+                // Filter query clauses to include filenames.
+                if ( isset( $query_args['s'] ) ) {
+                        add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+                }
+
                 $posts_query  = new WP_Query();
                 $query_result = $posts_query->query( $query_args );