<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[31037] trunk/src/wp-admin: Respect query vars for taxonomies passed as URL parameters when in grid mode of Media Library.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/31037">31037</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/31037","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-01-03 08:23:06 +0000 (Sat, 03 Jan 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Respect query vars for taxonomies passed as URL parameters when in grid mode of Media Library.
Fixes <a href="https://core.trac.wordpress.org/ticket/30584">#30584</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunksrcwpadminjsmediajs">trunk/src/wp-admin/js/media.js</a></li>
<li><a href="#trunksrcwpadminuploadphp">trunk/src/wp-admin/upload.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2015-01-03 06:26:38 UTC (rev 31036)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2015-01-03 08:23:06 UTC (rev 31037)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2159,11 +2159,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $query = isset( $_REQUEST['query'] ) ? (array) $_REQUEST['query'] : array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query = array_intersect_key( $query, array_flip( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $keys = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 's', 'order', 'orderby', 'posts_per_page', 'paged', 'post_mime_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent', 'post__in', 'post__not_in', 'year', 'monthnum'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ );
+ foreach ( get_taxonomies_for_attachments( 'objects' ) as $t ) {
+ if ( $t->query_var && isset( $query[ $t->query_var ] ) ) {
+ $keys[] = $t->query_var;
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query = array_intersect_key( $query, array_flip( $keys ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $query['post_type'] = 'attachment';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( MEDIA_TRASH
</span><span class="cx" style="display: block; padding: 0 10px"> && ! empty( $_REQUEST['query']['post_status'] )
</span></span></pre></div>
<a id="trunksrcwpadminincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/post.php 2015-01-03 06:26:38 UTC (rev 31036)
+++ trunk/src/wp-admin/includes/post.php 2015-01-03 08:23:06 UTC (rev 31037)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1021,32 +1021,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Executes a query for attachments. An array of WP_Query arguments
- * can be passed in, which will override the arguments set by this function.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Get the query vars for the current attachments request
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 2.5.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.2.0
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array|bool $q Array of query variables to use to build the query or false to use $_GET superglobal.
- * @return array
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @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.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_edit_attachments_query( $q = false ) {
- if ( false === $q )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_edit_attachments_query_vars( $q = false ) {
+ if ( false === $q ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $q = $_GET;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $q['m'] = isset( $q['m'] ) ? (int) $q['m'] : 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $q['cat'] = isset( $q['cat'] ) ? (int) $q['cat'] : 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $q['post_type'] = 'attachment';
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = get_post_type_object( 'attachment' );
</span><span class="cx" style="display: block; padding: 0 10px"> $states = 'inherit';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( current_user_can( $post_type->cap->read_private_posts ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( current_user_can( $post_type->cap->read_private_posts ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $states .= ',private';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q['post_status'] = isset( $q['status'] ) && 'trash' == $q['status'] ? 'trash' : $states;
</span><span class="cx" style="display: block; padding: 0 10px"> $q['post_status'] = isset( $q['attachment-filter'] ) && 'trash' == $q['attachment-filter'] ? 'trash' : $states;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $media_per_page = (int) get_user_option( 'upload_per_page' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $media_per_page ) || $media_per_page < 1 )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $media_per_page ) || $media_per_page < 1 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $media_per_page = 20;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the number of items to list per page when listing media items.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1058,10 +1060,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $q['posts_per_page'] = apply_filters( 'upload_per_page', $media_per_page );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_mime_types = get_post_mime_types();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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) ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset($q['post_mime_type']) && !array_intersect( (array) $q['post_mime_type'], array_keys($post_mime_types) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset($q['post_mime_type']);
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach( array_keys( $post_mime_types ) as $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $q['attachment-filter'] ) && "post_mime_type:$type" == $q['attachment-filter'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1074,9 +1075,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $q['post_parent'] = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp( $q );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $q;
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return array($post_mime_types, $avail_post_mime_types);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * 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 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpadminjsmediajs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/media.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/media.js 2015-01-03 06:26:38 UTC (rev 31036)
+++ trunk/src/wp-admin/js/media.js 2015-01-03 08:23:06 UTC (rev 31037)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,4 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* global ajaxurl, attachMediaBoxL10n */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* global ajaxurl, attachMediaBoxL10n, _wpMediaGridSettings */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> var findPosts;
</span><span class="cx" style="display: block; padding: 0 10px"> ( function( $ ){
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,13 +72,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $( document ).ready( function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var $mediaGridWrap = $( '#wp-media-grid' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var settings, $mediaGridWrap = $( '#wp-media-grid' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Open up a manage media frame into the grid.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $mediaGridWrap.length && window.wp && window.wp.media ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ settings = _wpMediaGridSettings;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> window.wp.media({
</span><span class="cx" style="display: block; padding: 0 10px"> frame: 'manage',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- container: $mediaGridWrap
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ container: $mediaGridWrap,
+ library: settings.queryVars
</ins><span class="cx" style="display: block; padding: 0 10px"> }).open();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminuploadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/upload.php 2015-01-03 06:26:38 UTC (rev 31036)
+++ trunk/src/wp-admin/upload.php 2015-01-03 08:23:06 UTC (rev 31037)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,8 +24,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_media();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'media-grid' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'media' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $vars = wp_edit_attachments_query_vars();
+ unset( $vars['mode'], $vars['post_type'], $vars['post_status'], $vars['posts_per_page'] );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script( 'media-grid', '_wpMediaGridSettings', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'adminUrl' => parse_url( self_admin_url(), PHP_URL_PATH ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'queryVars' => $vars
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> get_current_screen()->add_help_tab( array(
</span></span></pre>
</div>
</div>
</body>
</html>