<!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>[24093] trunk: the_post_format_gallery() (and Twenty Thirteen using it).</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24093">24093</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-04-25 07:42:59 +0000 (Thu, 25 Apr 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>the_post_format_gallery() (and Twenty Thirteen using it).

fixes <a href="http://core.trac.wordpress.org/ticket/24126">#24126</a>. props obenland, wonderboymusic.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentythirteencontentgalleryphp">trunk/wp-content/themes/twentythirteen/content-gallery.php</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentythirteencontentgalleryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/content-gallery.php (24092 => 24093)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/content-gallery.php        2013-04-25 07:28:33 UTC (rev 24092)
+++ trunk/wp-content/themes/twentythirteen/content-gallery.php        2013-04-25 07:42:59 UTC (rev 24093)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx">                         &lt;?php the_content( __( 'Continue reading &lt;span class=&quot;meta-nav&quot;&gt;&amp;rarr;&lt;/span&gt;', 'twentythirteen' ) ); ?&gt;
</span><span class="cx">                         &lt;?php wp_link_pages( array( 'before' =&gt; '&lt;div class=&quot;page-links&quot;&gt;&lt;span class=&quot;page-links-title&quot;&gt;' . __( 'Pages:', 'twentythirteen' ) . '&lt;/span&gt;', 'after' =&gt; '&lt;/div&gt;', 'link_before' =&gt; '&lt;span&gt;', 'link_after' =&gt; '&lt;/span&gt;' ) ); ?&gt;
</span><span class="cx">                 &lt;?php else : ?&gt;
</span><del>-                        &lt;?php the_content(); ?&gt;
</del><ins>+                        &lt;?php the_post_format_gallery(); ?&gt;
</ins><span class="cx">                 &lt;?php endif; // is_single() ?&gt;
</span><span class="cx">         &lt;/div&gt;&lt;!-- .entry-content --&gt;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (24092 => 24093)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php        2013-04-25 07:28:33 UTC (rev 24092)
+++ trunk/wp-includes/media.php        2013-04-25 07:42:59 UTC (rev 24093)
</span><span class="lines">@@ -2294,11 +2294,12 @@
</span><span class="cx">  * @since 3.6.0
</span><span class="cx">  *
</span><span class="cx">  * @param string $content A string which might contain image data.
</span><ins>+ * @param boolean $html Whether to return HTML or data
</ins><span class="cx">  * @param boolean $remove Optional. Whether to remove the found data from the passed content.
</span><span class="cx">  * @param int $limit Optional. The number of galleries to return
</span><span class="cx">  * @return array A list of galleries, which in turn are a list of their srcs in order
</span><span class="cx">  */
</span><del>-function get_content_galleries( &amp;$content, $remove = false, $limit = 0 ) {
</del><ins>+function get_content_galleries( &amp;$content, $html = true, $remove = false, $limit = 0 ) {
</ins><span class="cx">         $src = '';
</span><span class="cx">         $galleries = array();
</span><span class="cx">         $matches = array();
</span><span class="lines">@@ -2313,14 +2314,19 @@
</span><span class="cx"> 
</span><span class="cx">                                 $data = shortcode_parse_atts( $shortcode[3] );
</span><span class="cx">                                 $gallery = do_shortcode_tag( $shortcode );
</span><del>-                                preg_match_all( '#src=[\'&quot;](.+?)[\'&quot;]#is', $gallery, $src, PREG_SET_ORDER );
-                                if ( ! empty( $src ) ) {
-                                        foreach ( $src as $s )
-                                                $srcs[] = $s[1];
</del><ins>+                                if ( $html ) {
+                                        $galleries[] = $gallery;
+                                } else {
+                                        preg_match_all( '#src=[\'&quot;](.+?)[\'&quot;]#is', $gallery, $src, PREG_SET_ORDER );
+                                        if ( ! empty( $src ) ) {
+                                                foreach ( $src as $s )
+                                                        $srcs[] = $s[1];
+                                        }
+
+                                        $data['src'] = array_values( array_unique( $srcs ) );
+                                        $galleries[] = $data;
</ins><span class="cx">                                 }
</span><span class="cx"> 
</span><del>-                                $data['src'] = array_values( array_unique( $srcs ) );
-                                $galleries[] = $data;
</del><span class="cx">                                 if ( $limit &gt; 0 &amp;&amp; count( $galleries ) &gt;= $limit )
</span><span class="cx">                                         break;
</span><span class="cx">                         }
</span><span class="lines">@@ -2336,15 +2342,16 @@
</span><span class="cx">  * @since 3.6.0
</span><span class="cx">  *
</span><span class="cx">  * @param int $post_id Optional. Post ID.
</span><ins>+ * @param boolean $html Whether to return HTML or data
</ins><span class="cx">  * @return array A list of arrays, each containing gallery data and srcs parsed
</span><span class="cx">  *                from the expanded shortcode
</span><span class="cx">  */
</span><del>-function get_post_galleries( $post_id = 0 ) {
</del><ins>+function get_post_galleries( $post_id = 0, $html = true ) {
</ins><span class="cx">         $post = empty( $post_id ) ? clone get_post() : get_post( $post_id );
</span><span class="cx">         if ( empty( $post ) || ! has_shortcode( $post-&gt;post_content, 'gallery' )  )
</span><span class="cx">                 return array();
</span><span class="cx"> 
</span><del>-        return get_content_galleries( $post-&gt;post_content );
</del><ins>+        return get_content_galleries( $post-&gt;post_content, $html );
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="lines">@@ -2361,7 +2368,7 @@
</span><span class="cx">         if ( empty( $post ) || ! has_shortcode( $post-&gt;post_content, 'gallery' )  )
</span><span class="cx">                 return array();
</span><span class="cx"> 
</span><del>-        $data = get_content_galleries( $post-&gt;post_content );
</del><ins>+        $data = get_content_galleries( $post-&gt;post_content, false );
</ins><span class="cx">         return wp_list_pluck( $data, 'src' );
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -2371,18 +2378,28 @@
</span><span class="cx">  * @since 3.6.0
</span><span class="cx">  *
</span><span class="cx">  * @param int $post_id Optional. Post ID.
</span><ins>+ * @param boolean $html Whether to return HTML or data
</ins><span class="cx">  * @return array Gallery data and srcs parsed from the expanded shortcode
</span><span class="cx">  */
</span><del>-function get_post_gallery( $post_id = 0 ) {
</del><ins>+function get_post_gallery( $post_id = 0, $html = true ) {
</ins><span class="cx">         $post = empty( $post_id ) ? clone get_post() : get_post( $post_id );
</span><span class="cx">         if ( empty( $post ) || ! has_shortcode( $post-&gt;post_content, 'gallery' ) )
</span><span class="cx">                 return array();
</span><span class="cx"> 
</span><del>-        $data = get_content_galleries( $post-&gt;post_content, false, 1 );
</del><ins>+        $data = get_content_galleries( $post-&gt;post_content, $html, false, 1 );
</ins><span class="cx">         return reset( $data );
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><ins>+ * Output the first gallery in the current (@global) $post
+ *
+ * @since 3.6.0
+ */
+function the_post_format_gallery() {
+        echo get_post_gallery();
+}
+
+/**
</ins><span class="cx">  * Check a post's content for galleries and return the image srcs for the first found gallery
</span><span class="cx">  *
</span><span class="cx">  * @since 3.6.0
</span><span class="lines">@@ -2391,7 +2408,7 @@
</span><span class="cx">  * @return array A list of a gallery's image srcs in order
</span><span class="cx">  */
</span><span class="cx"> function get_post_gallery_images( $post_id = 0 ) {
</span><del>-        $gallery = get_post_gallery( $post_id );
</del><ins>+        $gallery = get_post_gallery( $post_id, false );
</ins><span class="cx">         if ( empty( $gallery['src'] ) )
</span><span class="cx">                 return array();
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>