Changeset 51145 for trunk/src/wp-admin/includes/ajax-actions.php

Timestamp:

06/14/2021 08:49:05 PM (6 months ago)

Author:

joedolson

Message:

Media: Restore AJAX response data shape in media library.

Restore the original shape of the AJAX response data in the media library after removing infinite scroll, and pass total number of attachments in the response headers X-WP-Total and X-WP-TotalPages.

Improve backwards compatibility for plugins intercepting the ajax response. Headers match the structure and count calculation used in REST API responses.

Fix an issue with hiding the spinner after the load is completed and ensure that the load more view is created when changing tabs in the media library modal.

Follow up to [50829].

props adamsilverstein, spacedmonkey, joedolson.
Fixes #50105.

File:

• trunk/src/wp-admin/includes/ajax-actions.php (modified) (1 diff)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -2991 +2991 @@
      */
     $query = apply_filters( 'ajax_query_attachments_args', $query );
-    $query = new WP_Query( $query );
-
-    $posts = array_map( 'wp_prepare_attachment_for_js', $query->posts );
+    $attachments_query = new WP_Query( $query );
+
+    $posts = array_map( 'wp_prepare_attachment_for_js', $attachments_query->posts );
     $posts = array_filter( $posts );
-
-    $result = array(
-        'attachments'      => $posts,
-        'totalAttachments' => $query->found_posts,
-    );
-
-    wp_send_json_success( $result );
+    $total_posts = $attachments_query->found_posts;
+
+    if ( $total_posts < 1 ) {
+        // Out-of-bounds, run the query again without LIMIT for total count.
+        unset( $query['paged'] );
+
+        $count_query = new WP_Query();
+        $count_query->query( $query_args );
+        $total_posts = $count_query->found_posts;
+    }
+
+    $max_pages = ceil( $total_posts / (int) $attachments_query->query['posts_per_page'] );
+
+    header( 'X-WP-Total: ' . (int) $total_posts );
+    header( 'X-WP-TotalPages: ' . (int) $max_pages );
+
+    wp_send_json_success( $posts );
 }