Changeset 31037 for trunk/src/wp-admin/includes/post.php

Timestamp:

01/03/2015 08:23:06 AM (10 years ago)

Author:

wonderboymusic

Message:

Respect query vars for taxonomies passed as URL parameters when in grid mode of Media Library.

Fixes #30584.

File:

• trunk/src/wp-admin/includes/post.php (modified) (5 diffs)

trunk/src/wp-admin/includes/post.php

@@ -1022 +1022 @@
 
 /**
- * Executes a query for attachments. An array of WP_Query arguments
- * can be passed in, which will override the arguments set by this function.
- *
- * @since 2.5.0
- *
- * @param array|bool $q Array of query variables to use to build the query or false to use $_GET superglobal.
- * @return array
- */
-function wp_edit_attachments_query( $q = false ) {
-    if ( false === $q )
+ * Get the query vars for the current attachments request
+ *
+ * @since 4.2.0
+ *
+ * @param array|false $q Array of query variables to use to build the query or false to use $_GET superglobal.
+ *
+ * @return array The parsed query vars.
+ */
+function wp_edit_attachments_query_vars( $q = false ) {
+    if ( false === $q ) {
         $q = $_GET;
-
+    }
     $q['m']   = isset( $q['m'] ) ? (int) $q['m'] : 0;
     $q['cat'] = isset( $q['cat'] ) ? (int) $q['cat'] : 0;
@@ -1039 +1039 @@
     $post_type = get_post_type_object( 'attachment' );
     $states = 'inherit';
-    if ( current_user_can( $post_type->cap->read_private_posts ) )
+    if ( current_user_can( $post_type->cap->read_private_posts ) ) {
         $states .= ',private';
+    }
 
     $q['post_status'] = isset( $q['status'] ) && 'trash' == $q['status'] ? 'trash' : $states;
@@ -1046 +1047 @@
 
     $media_per_page = (int) get_user_option( 'upload_per_page' );
-    if ( empty( $media_per_page ) || $media_per_page < 1 )
+    if ( empty( $media_per_page ) || $media_per_page < 1 ) {
         $media_per_page = 20;
+    }
 
     /**
@@ -1059 +1061 @@
 
     $post_mime_types = get_post_mime_types();
-    $avail_post_mime_types = get_available_post_mime_types('attachment');
-
-    if ( isset($q['post_mime_type']) && !array_intersect( (array) $q['post_mime_type'], array_keys($post_mime_types) ) )
+    if ( isset($q['post_mime_type']) && !array_intersect( (array) $q['post_mime_type'], array_keys($post_mime_types) ) ) {
         unset($q['post_mime_type']);
+    }
 
     foreach( array_keys( $post_mime_types ) as $type ) {
@@ -1075 +1076 @@
     }
 
-    wp( $q );
-
-    return array($post_mime_types, $avail_post_mime_types);
+    return $q;
+}
+
+/**
+ * Executes a query for attachments. An array of WP_Query arguments
+ * can be passed in, which will override the arguments set by this function.
+ *
+ * @since 2.5.0
+ *
+ * @param array|false $q Array of query variables to use to build the query or false to use $_GET superglobal.
+ * @return array
+ */
+function wp_edit_attachments_query( $q = false ) {
+    wp( wp_edit_attachments_query_vars( $q ) );
+
+    $post_mime_types = get_post_mime_types();
+    $avail_post_mime_types = get_available_post_mime_types( 'attachment' );
+
+    return array( $post_mime_types, $avail_post_mime_types );
 }