<!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>[24402] trunk/wp-content/themes/twentythirteen: Twenty Thirteen: Clean up image attachment template and move logic to `twentythirteen_the_attached_image()` function.</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/24402">24402</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-06-03 21:44:25 +0000 (Mon, 03 Jun 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Thirteen: Clean up image attachment template and move logic to `twentythirteen_the_attached_image()` function. Props obenland, fixes <a href="http://core.trac.wordpress.org/ticket/24479">#24479</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentythirteenfunctionsphp">trunk/wp-content/themes/twentythirteen/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentythirteenimagephp">trunk/wp-content/themes/twentythirteen/image.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentythirteenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/functions.php (24401 => 24402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/functions.php 2013-06-03 21:35:26 UTC (rev 24401)
+++ trunk/wp-content/themes/twentythirteen/functions.php 2013-06-03 21:44:25 UTC (rev 24402)
</span><span class="lines">@@ -420,7 +420,60 @@
</span><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">
</span><ins>+if ( ! function_exists( 'twentythirteen_the_attached_image' ) ) :
</ins><span class="cx"> /**
</span><ins>+ * Prints the attached image with a link to the next attached image.
+ *
+ * @since Twenty Thirteen 1.0
+ *
+ * @return void
+ */
+function twentythirteen_the_attached_image() {
+ $post = get_post();
+ $attachment_size = apply_filters( 'twentythirteen_attachment_size', array( 724, 724 ) );
+ $next_attachment_url = wp_get_attachment_url();
+
+ /**
+ * Grab the IDs of all the image attachments in a gallery so we can get the URL
+ * of the next adjacent image in a gallery, or the first image (if we're
+ * looking at the last image in a gallery), or, in a gallery of one, just the
+ * link to that image file.
+ */
+ $attachments = array_values( get_children( array(
+ 'post_parent' => $post->post_parent,
+ 'post_status' => 'inherit',
+ 'post_type' => 'attachment',
+ 'post_mime_type' => 'image',
+ 'order' => 'ASC',
+ 'orderby' => 'menu_order ID'
+ ) ) );
+
+ // If there is more than 1 attachment in a gallery...
+ if ( count( $attachments ) > 1 ) {
+ foreach ( $attachments as $k => $attachment ) {
+ if ( $attachment->ID == $post->ID )
+ break;
+ }
+ $k++;
+
+ // get the URL of the next image attachment...
+ if ( isset( $attachments[ $k ] ) )
+ $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
+
+ // or get the URL of the first image attachment.
+ else
+ $next_attachment_url = get_attachment_link( $attachments[0]->ID );
+ }
+
+ printf( '<a href="%1$s" title="%2$s" rel="attachment">%3$s</a>',
+ esc_url( $next_attachment_url ),
+ the_title_attribute( array( 'echo' => false ) ),
+ wp_get_attachment_image( $post->ID, $attachment_size )
+ );
+}
+endif;
+
+/**
</ins><span class="cx"> * Returns the URL from the post.
</span><span class="cx"> *
</span><span class="cx"> * @uses get_the_post_format_url() to get the URL in the post meta (if it exists) or
</span></span></pre></div>
<a id="trunkwpcontentthemestwentythirteenimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/image.php (24401 => 24402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/image.php 2013-06-03 21:35:26 UTC (rev 24401)
+++ trunk/wp-content/themes/twentythirteen/image.php 2013-06-03 21:44:25 UTC (rev 24402)
</span><span class="lines">@@ -9,41 +9,6 @@
</span><span class="cx"> * @since Twenty Thirteen 1.0
</span><span class="cx"> */
</span><span class="cx">
</span><del>-the_post();
-
-/**
- * Grab the IDs of all the image attachments in a gallery so we can get the URL of the next adjacent image in a gallery,
- * or the first image (if we're looking at the last image in a gallery), or, in a gallery of one, just the link to that image file
- */
-$attachments = array_values( get_children( array(
- 'post_parent' => $post->post_parent,
- 'post_status' => 'inherit',
- 'post_type' => 'attachment',
- 'post_mime_type' => 'image',
- 'order' => 'ASC',
- 'orderby' => 'menu_order ID'
-) ) );
-
-foreach ( $attachments as $k => $attachment ) :
-if ( $attachment->ID == $post->ID )
- break;
-endforeach;
-
-$k++;
-// If there is more than 1 attachment in a gallery
-if ( count( $attachments ) > 1 ) :
- if ( isset( $attachments[ $k ] ) ) :
- // get the URL of the next image attachment
- $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
- else :
- // or get the URL of the first image attachment
- $next_attachment_url = get_attachment_link( $attachments[ 0 ]->ID );
- endif;
-else :
- // or, if there's only 1 image, get the URL of the image
- $next_attachment_url = wp_get_attachment_url();
-endif;
-
</del><span class="cx"> get_header(); ?>
</span><span class="cx">
</span><span class="cx"> <div id="primary" class="content-area">
</span><span class="lines">@@ -54,10 +19,10 @@
</span><span class="cx">
</span><span class="cx"> <div class="entry-meta">
</span><span class="cx"> <?php
</span><del>- $published_text = __( '<span class="attachment-meta">Published on <time class="entry-date" datetime="%1$s">%2$s</time> in <a href="%3$s" title="Return to %4$s" rel="gallery">%5$s</a></span>', 'twentythirteen' );
</del><ins>+ $published_text = __( '<span class="attachment-meta">Published on <time class="entry-date" datetime="%1$s">%2$s</time> in <a href="%3$s" title="Return to %4$s" rel="gallery">%5$s</a></span>', 'twentythirteen' );
</ins><span class="cx"> $post_title = get_the_title( $post->post_parent );
</span><span class="cx"> if ( empty( $post_title ) || 0 == $post->post_parent )
</span><del>- $published_text = '<span class="attachment-meta"><time class="entry-date" datetime="%1$s">%2$s</time></span>';
</del><ins>+ $published_text = '<span class="attachment-meta"><time class="entry-date" datetime="%1$s">%2$s</time></span>';
</ins><span class="cx">
</span><span class="cx"> printf( $published_text,
</span><span class="cx"> esc_attr( get_the_date( 'c' ) ),
</span><span class="lines">@@ -76,7 +41,8 @@
</span><span class="cx"> $metadata['height']
</span><span class="cx"> );
</span><span class="cx">
</span><del>- edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' ); ?>
</del><ins>+ edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' );
+ ?>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx"> </header><!-- .entry-header -->
</span><span class="cx">
</span><span class="lines">@@ -88,18 +54,14 @@
</span><span class="cx">
</span><span class="cx"> <div class="entry-attachment">
</span><span class="cx"> <div class="attachment">
</span><del>- <a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php
- $attachment_size = apply_filters( 'twentythirteen_attachment_size', array( 724, 724 ) );
- echo wp_get_attachment_image( $post->ID, $attachment_size );
- ?></a>
</del><ins>+ <?php twentythirteen_the_attached_image(); ?>
</ins><span class="cx">
</span><del>- <?php if ( ! empty( $post->post_excerpt ) ) : ?>
</del><ins>+ <?php if ( has_excerpt() ) : ?>
</ins><span class="cx"> <div class="entry-caption">
</span><span class="cx"> <?php the_excerpt(); ?>
</span><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </div><!-- .attachment -->
</span><del>-
</del><span class="cx"> </div><!-- .entry-attachment -->
</span><span class="cx">
</span><span class="cx"> <?php if ( ! empty( $post->post_content ) ) : ?>
</span><span class="lines">@@ -110,7 +72,6 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> </div><!-- .entry-content -->
</span><del>-
</del><span class="cx"> </article><!-- #post -->
</span><span class="cx">
</span><span class="cx"> <?php comments_template(); ?>
</span></span></pre>
</div>
</div>
</body>
</html>