Ticket #14424: 14424.5.diff

src/wp-admin/includes/post.php

@@ -934 +934 @@
                 unset($q['post_mime_type']);
 
         if ( isset($q['detached']) )
-                add_filter('posts_where', '_edit_attachments_query_helper');
+                $q['post_parent'] = 0;
 
         wp( $q );
 
-        if ( isset($q['detached']) )
-                remove_filter('posts_where', '_edit_attachments_query_helper');
-
         return array($post_mime_types, $avail_post_mime_types);
 }
 
-function _edit_attachments_query_helper($where) {
-        global $wpdb;
-        return $where .= " AND {$wpdb->posts}.post_parent < 1";
-}
-
 /**
  * Returns the list of classes to be used by a metabox
  *

src/wp-admin/includes/media.php

@@ -2260 +2260 @@
         if ( get_user_setting('uploader') )
                 $form_class .= ' html-uploader';
 
-        $_GET['paged'] = isset( $_GET['paged'] ) ? intval($_GET['paged']) : 0;
-        if ( $_GET['paged'] < 1 )
-                $_GET['paged'] = 1;
-        $start = ( $_GET['paged'] - 1 ) * 10;
-        if ( $start < 1 )
-                $start = 0;
-        add_filter( 'post_limits', create_function( '$a', "return 'LIMIT $start, 10';" ) );
+        $q = $_GET;
+        $q['posts_per_page'] = 10;
+        $q = isset( $q['paged'] ) ? intval( $q['paged'] ) : 0;
+        if ( $q['paged'] < 1 ) {
+                $q['paged'] = 1;
+        }
+        $q['offset'] = ( $q['paged'] - 1 ) * 10;
+        if ( $q['offset'] < 1 ) {
+                $q['offset'] = 0;
+        }
 
-        list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query();
+        list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query( $q );
 
 ?>