<!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>[40425] branches/4.7: Media: Add filters to allow overriding slow media queries.</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/40425">40425</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/40425","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>swissspidy</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-04-14 08:39:46 +0000 (Fri, 14 Apr 2017)</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'>Media: Add filters to allow overriding slow media queries.
There are a couple of queries that do a full table scan of attachment posts to support features of the media library. Pending a more complete solution, allow overriding these queries via filters.
Props sboisvert, jnylen0.
See <a href="https://core.trac.wordpress.org/ticket/31071">#31071</a>.
Merges <a href="https://core.trac.wordpress.org/changeset/40382">[40382]</a> and <a href="https://core.trac.wordpress.org/changeset/40421">[40421]</a> to the 4.7 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches47srcwpincludesmediaphp">branches/4.7/src/wp-includes/media.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches47">branches/4.7/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.7
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.7 2017-04-13 23:08:03 UTC (rev 40424)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.7 2017-04-14 08:39:46 UTC (rev 40425)
</ins><a id="branches47"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.7</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,39365,39367,39369,39371,39373,39375-39376,39378,39380,39382,39384,39386,39388,39390,39392-39393,39396-39397,39400,39402,39404,39406,39409,39411,39413,39415,39417-39420,39424,39426,39428,39430,39432-39434,39436,39438,39440,39442-39444,39447,39449-39451,39453,39455-39457,39460,39462,39464,39466,39468,39470-39471,39475,39477-39478,39482-39483,39487-39488,39490,39495-39496,39499,39502,39504,39506,39508,39510,39512,39514,39517,39520,39522,39545-39547,39557-39563,39565,39578,39580-39581,39584,39586,39594-39595,39597-39599,39601,39603,39612-39613,39616-39617,39619-39623,39626,39635,39640,39645,39649,39657,39659,39663,39677-39678,39680-39681,39684-39686,39688-39689,39692,39720,39742,39744,39759-39760,39772,39795,39807-39808,39831,39843,39848,39850,39912,39914,39919,39923-39924,39949,39951-39952,39954,39956,39968,39992,39994,40030,40036-40037,40039-40041,40045,40049,40055-40056,40058
,40061,40063-40066,40068,40070,40074,40077,40080,40082,40086,40089,40101,40104-40106,40108-40110,40118,40120-40126,40129-40131,40148,40160,40169,40181,40183,40195,40235,40238,40241,40252,40255,40257-40259,40263-40264,40269,40271,40284,40290,40300-40306,40311,40313-40316,40318-40320,40324,40333,40353,40357-40358,40368,40379-40381,40395-40398,40405
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,39365,39367,39369,39371,39373,39375-39376,39378,39380,39382,39384,39386,39388,39390,39392-39393,39396-39397,39400,39402,39404,39406,39409,39411,39413,39415,39417-39420,39424,39426,39428,39430,39432-39434,39436,39438,39440,39442-39444,39447,39449-39451,39453,39455-39457,39460,39462,39464,39466,39468,39470-39471,39475,39477-39478,39482-39483,39487-39488,39490,39495-39496,39499,39502,39504,39506,39508,39510,39512,39514,39517,39520,39522,39545-39547,39557-39563,39565,39578,39580-39581,39584,39586,39594-39595,39597-39599,39601,39603,39612-39613,39616-39617,39619-39623,39626,39635,39640,39645,39649,39657,39659,39663,39677-39678,39680-39681,39684-39686,39688-39689,39692,39720,39742,39744,39759-39760,39772,39795,39807-39808,39831,39843,39848,39850,39912,39914,39919,39923-39924,39949,39951-39952,39954,39956,39968,39992,39994,40030,40036-40037,40039-40041,40045,40049,40055-40056,40058,
40061,40063-40066,40068,40070,40074,40077,40080,40082,40086,40089,40101,40104-40106,40108-40110,40118,40120-40126,40129-40131,40148,40160,40169,40181,40183,40195,40235,40238,40241,40252,40255,40257-40259,40263-40264,40269,40271,40284,40290,40300-40306,40311,40313-40316,40318-40320,40324,40333,40353,40357-40358,40368,40379-40382,40395-40398,40405,40421
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches47srcwpincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/src/wp-includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/src/wp-includes/media.php 2017-04-13 23:08:03 UTC (rev 40424)
+++ branches/4.7/src/wp-includes/media.php 2017-04-14 08:39:46 UTC (rev 40425)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3319,26 +3319,81 @@
</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">- $has_audio = $wpdb->get_var( "
- SELECT ID
- FROM $wpdb->posts
- WHERE post_type = 'attachment'
- AND post_mime_type LIKE 'audio%'
- LIMIT 1
- " );
- $has_video = $wpdb->get_var( "
- SELECT ID
- FROM $wpdb->posts
- WHERE post_type = 'attachment'
- AND post_mime_type LIKE 'video%'
- LIMIT 1
- " );
- $months = $wpdb->get_results( $wpdb->prepare( "
- SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
- FROM $wpdb->posts
- WHERE post_type = %s
- ORDER BY post_date DESC
- ", 'attachment' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Allows showing or hiding the "Create Audio Playlist" button in the media library.
+ *
+ * By default (if this filter returns `null`), a query will be run to
+ * determine whether the media library contains any audio items. This
+ * query is expensive for large media libraries, so it may be desirable for
+ * sites to override this behavior.
+ *
+ * @since 4.7.4
+ *
+ * @link https://core.trac.wordpress.org/ticket/31071
+ *
+ * @param bool|null Whether to show the button, or `null` for default behavior.
+ */
+ $show_audio_playlist = apply_filters( 'media_library_show_audio_playlist', null );
+ if ( null === $show_audio_playlist ) {
+ $show_audio_playlist = $wpdb->get_var( "
+ SELECT ID
+ FROM $wpdb->posts
+ WHERE post_type = 'attachment'
+ AND post_mime_type LIKE 'audio%'
+ LIMIT 1
+ " );
+ }
+
+ /**
+ * Allows showing or hiding the "Create Video Playlist" button in the media library.
+ *
+ * By default (if this filter returns `null`), a query will be run to
+ * determine whether the media library contains any video items. This
+ * query is expensive for large media libraries, so it may be desirable for
+ * sites to override this behavior.
+ *
+ * @since 4.7.4
+ *
+ * @link https://core.trac.wordpress.org/ticket/31071
+ *
+ * @param bool|null Whether to show the button, or `null` for default behavior.
+ */
+ $show_video_playlist = apply_filters( 'media_library_show_video_playlist', null );
+ if ( null === $show_video_playlist ) {
+ $show_video_playlist = $wpdb->get_var( "
+ SELECT ID
+ FROM $wpdb->posts
+ WHERE post_type = 'attachment'
+ AND post_mime_type LIKE 'video%'
+ LIMIT 1
+ " );
+ }
+
+ /**
+ * Allows overriding the list of months displayed in the media library.
+ *
+ * By default (if this filter does not return an array), a query will be
+ * run to determine the months that have media items. This query can be
+ * expensive for large media libraries, so it may be desirable for sites to
+ * override this behavior.
+ *
+ * @since 4.7.4
+ *
+ * @link https://core.trac.wordpress.org/ticket/31071
+ *
+ * @param array|null An array of objects with `month` and `year`
+ * properties, or `null` (or any other non-array value)
+ * for default behavior.
+ */
+ $months = apply_filters( 'media_library_months_with_files', null );
+ if ( ! is_array( $months ) ) {
+ $months = $wpdb->get_results( $wpdb->prepare( "
+ SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
+ FROM $wpdb->posts
+ WHERE post_type = %s
+ ORDER BY post_date DESC
+ ", 'attachment' ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $months as $month_year ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $month_year->text = sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $month_year->month ), $month_year->year );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3357,14 +3412,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'defaultProps' => $props,
</span><span class="cx" style="display: block; padding: 0 10px"> 'attachmentCounts' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'audio' => ( $has_audio ) ? 1 : 0,
- 'video' => ( $has_video ) ? 1 : 0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'audio' => ( $show_audio_playlist ) ? 1 : 0,
+ 'video' => ( $show_video_playlist ) ? 1 : 0,
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'embedExts' => $exts,
</span><span class="cx" style="display: block; padding: 0 10px"> 'embedMimes' => $ext_mimes,
</span><span class="cx" style="display: block; padding: 0 10px"> 'contentWidth' => $content_width,
</span><span class="cx" style="display: block; padding: 0 10px"> 'months' => $months,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mediaTrash' => MEDIA_TRASH ? 1 : 0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mediaTrash' => MEDIA_TRASH ? 1 : 0,
</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"> $post = null;
</span></span></pre>
</div>
</div>
</body>
</html>