<!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>[23776] trunk/wp-includes/media.php: Add a generic `get_attached_media()` function and use it in get_attached_audio|video|images.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/23776">23776</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2013-03-22 08:08:46 +0000 (Fri, 22 Mar 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a generic `get_attached_media()` function and use it in get_attached_audio|video|images. Add filters for the query args and resulting array. fixes <a href="http://core.trac.wordpress.org/ticket/23843">#23843</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (23775 => 23776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php        2013-03-22 07:28:56 UTC (rev 23775)
+++ trunk/wp-includes/media.php        2013-03-22 08:08:46 UTC (rev 23776)
</span><span class="lines">@@ -1774,30 +1774,48 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Retrieve audio attached to the passed post
</del><ins>+ * Retrieve media attached to the passed post
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.6.0
</span><span class="cx"> *
</span><ins>+ * @param string $type (Mime) type of media desired
</ins><span class="cx"> * @param int $post_id Post ID
</span><del>- * @return array Found audio attachments
</del><ins>+ * @return array Found attachments
</ins><span class="cx"> */
</span><del>-function get_attached_audio( $post_id = 0 ) {
</del><ins>+function get_attached_media( $type, $post_id = 0 ) {
</ins><span class="cx">         $post = empty( $post_id ) ? get_post() : get_post( $post_id );
</span><span class="cx">         if ( empty( $post ) )
</span><span class="cx">                 return;
</span><span class="cx">
</span><del>-        $children = get_children( array(
</del><ins>+        $args = array(
</ins><span class="cx">                 'post_parent' => $post->ID,
</span><span class="cx">                 'post_type' => 'attachment',
</span><del>-                'post_mime_type' => 'audio',
-                'posts_per_page' => -1
-        ) );
</del><ins>+                'post_mime_type' => $type,
+                'posts_per_page' => -1,
+                'orderby' => 'menu_order',
+                'order' => 'ASC',
+        );
</ins><span class="cx">
</span><del>-        if ( ! empty( $children ) )
-                return $children;
</del><ins>+        $args = apply_filters( 'get_attached_media_args', $args, $type, $post );
+
+        $children = get_children( $args );
+
+        return (array) apply_filters( 'get_attached_media', $children, $type, $post );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Retrieve audio attached to the passed post
+ *
+ * @since 3.6.0
+ *
+ * @param int $post_id Post ID
+ * @return array Found audio attachments
+ */
+function get_attached_audio( $post_id = 0 ) {
+        return get_attached_media( 'audio', $post_id );
+}
+
+/**
</ins><span class="cx"> * Retrieve video attached to the passed post
</span><span class="cx"> *
</span><span class="cx"> * @since 3.6.0
</span><span class="lines">@@ -1806,19 +1824,7 @@
</span><span class="cx"> * @return array Found video attachments
</span><span class="cx"> */
</span><span class="cx"> function get_attached_video( $post_id = 0 ) {
</span><del>-        $post = empty( $post_id ) ? get_post() : get_post( $post_id );
-        if ( empty( $post ) )
-                return;
-
-        $children = get_children( array(
-                'post_parent' => $post->ID,
-                'post_type' => 'attachment',
-                'post_mime_type' => 'video',
-                'posts_per_page' => -1
-        ) );
-
-        if ( ! empty( $children ) )
-                return $children;
</del><ins>+        return get_attached_media( 'video', $post_id );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2003,23 +2009,7 @@
</span><span class="cx"> * @return array Found image attachments
</span><span class="cx"> */
</span><span class="cx"> function get_attached_images( $post_id = 0 ) {
</span><del>-        $post = empty( $post_id ) ? get_post() : get_post( $post_id );
-        if ( empty( $post ) )
-                return array();
-
-        $children = get_children( array(
-                'post_parent' => $post->ID,
-                'post_type' => 'attachment',
-                'post_mime_type' => 'image',
-                'posts_per_page' => -1,
-                'orderby' => 'menu_order',
-                'order' => 'ASC'
-        ) );
-
-        if ( ! empty( $children ) )
-                return $children;
-
-        return array();
</del><ins>+        return get_attached_media( 'image', $post_id );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>