<!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>[24029] trunk/wp-content/themes/twentythirteen: Twenty Thirteen: Use the_post_format_gallery().</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/24029">24029</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-04-18 17:08:55 +0000 (Thu, 18 Apr 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Thirteen: Use the_post_format_gallery(). props obenland, fixes <a href="http://core.trac.wordpress.org/ticket/24126">#24126</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentythirteencontentgalleryphp">trunk/wp-content/themes/twentythirteen/content-gallery.php</a></li>
<li><a href="#trunkwpcontentthemestwentythirteenfunctionsphp">trunk/wp-content/themes/twentythirteen/functions.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 (24028 => 24029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/content-gallery.php 2013-04-18 15:02:30 UTC (rev 24028)
+++ trunk/wp-content/themes/twentythirteen/content-gallery.php 2013-04-18 17:08:55 UTC (rev 24029)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
</span><span class="cx"> <?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
</span><span class="cx"> <?php else : ?>
</span><del>- <?php twentythirteen_featured_gallery(); ?>
</del><ins>+ <?php the_post_format_gallery(); ?>
</ins><span class="cx"> <?php endif; // is_single() ?>
</span><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentythirteenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/functions.php (24028 => 24029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/functions.php 2013-04-18 15:02:30 UTC (rev 24028)
+++ trunk/wp-content/themes/twentythirteen/functions.php 2013-04-18 17:08:55 UTC (rev 24029)
</span><span class="lines">@@ -445,39 +445,21 @@
</span><span class="cx"> return ( $has_url ) ? $has_url : apply_filters( 'the_permalink', get_permalink() );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if ( ! function_exists( 'twentythirteen_featured_gallery' ) ) :
</del><span class="cx"> /**
</span><del>- * Displays first gallery from post content. Changes image size from thumbnail
- * to large, to display a larger first image.
- *
- * @since Twenty Thirteen 1.0
- *
- * @return void
- */
-function twentythirteen_featured_gallery() {
- $pattern = get_shortcode_regex();
-
- if ( preg_match( "/$pattern/s", get_the_content(), $match ) && 'gallery' == $match[2] ) {
- add_filter( 'shortcode_atts_gallery', 'twentythirteen_gallery_atts' );
- echo do_shortcode_tag( $match );
- }
-}
-endif;
-
-/**
</del><span class="cx"> * Sets the image size in featured galleries to large.
</span><span class="cx"> *
</span><del>- * @see twentythirteen_featured_gallery()
- *
</del><span class="cx"> * @since Twenty Thirteen 1.0
</span><span class="cx"> *
</span><span class="cx"> * @param array $atts Combined and filtered attribute list.
</span><span class="cx"> * @return array
</span><span class="cx"> */
</span><span class="cx"> function twentythirteen_gallery_atts( $atts ) {
</span><del>- $atts['size'] = 'large';
</del><ins>+ if ( has_post_format( 'gallery' ) && ! is_single() )
+ $atts['size'] = 'large';
+
</ins><span class="cx"> return $atts;
</span><span class="cx"> }
</span><ins>+add_filter( 'shortcode_atts_gallery', 'twentythirteen_gallery_atts' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Extends the default WordPress body class to denote:
</span></span></pre>
</div>
</div>
</body>
</html>