<!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>[24537] trunk/wp-content/themes/twentythirteen/functions.php: Twenty Thirteen: cleanup for functions.php file, props obenland.</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/24537">24537</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-07-01 17:27:41 +0000 (Mon, 01 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Thirteen: cleanup for functions.php file, props obenland. See <a href="http://core.trac.wordpress.org/ticket/24653">#24653</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentythirteenfunctionsphp">trunk/wp-content/themes/twentythirteen/functions.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 (24536 => 24537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/functions.php 2013-07-01 17:26:15 UTC (rev 24536)
+++ trunk/wp-content/themes/twentythirteen/functions.php 2013-07-01 17:27:41 UTC (rev 24537)
</span><span class="lines">@@ -34,13 +34,13 @@
</span><span class="cx"> /**
</span><span class="cx"> * Adds support for a custom header image.
</span><span class="cx"> */
</span><del>-require( get_template_directory() . '/inc/custom-header.php' );
</del><ins>+require get_template_directory() . '/inc/custom-header.php';
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Twenty Thirteen only works in WordPress 3.6 or later.
</span><span class="cx"> */
</span><span class="cx"> if ( version_compare( $GLOBALS['wp_version'], '3.6-alpha', '<' ) )
</span><del>- require( get_template_directory() . '/inc/back-compat.php' );
</del><ins>+ require get_template_directory() . '/inc/back-compat.php';
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Sets up theme defaults and registers the various WordPress features that
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> register_sidebar( array(
</span><span class="cx"> 'name' => __( 'Main Widget Area', 'twentythirteen' ),
</span><span class="cx"> 'id' => 'sidebar-1',
</span><del>- 'description' => __( 'Appears in the footer section of the site', 'twentythirteen' ),
</del><ins>+ 'description' => __( 'Appears in the footer section of the site.', 'twentythirteen' ),
</ins><span class="cx"> 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
</span><span class="cx"> 'after_widget' => '</aside>',
</span><span class="cx"> 'before_title' => '<h3 class="widget-title">',
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> global $wp_query;
</span><span class="cx">
</span><span class="cx"> // Don't print empty markup if there's only one page.
</span><del>- if ( $wp_query->max_num_pages < 2 && ( is_home() || is_archive() || is_search() ) )
</del><ins>+ if ( $wp_query->max_num_pages < 2 )
</ins><span class="cx"> return;
</span><span class="cx"> ?>
</span><span class="cx"> <nav class="navigation paging-navigation" role="navigation">
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx">
</span><span class="cx"> // Don't print empty markup if there's nowhere to navigate.
</span><span class="cx"> $previous = ( is_attachment() ) ? get_post( $post->post_parent ) : get_adjacent_post( false, '', true );
</span><del>- $next = get_adjacent_post( false, '', false );
</del><ins>+ $next = get_adjacent_post( false, '', false );
</ins><span class="cx">
</span><span class="cx"> if ( ! $next && ! $previous )
</span><span class="cx"> return;
</span><span class="lines">@@ -444,30 +444,33 @@
</span><span class="cx"> * looking at the last image in a gallery), or, in a gallery of one, just the
</span><span class="cx"> * link to that image file.
</span><span class="cx"> */
</span><del>- $attachments = array_values( get_children( array(
</del><ins>+ $attachment_ids = get_posts( array(
</ins><span class="cx"> 'post_parent' => $post->post_parent,
</span><ins>+ 'fields' => 'ids',
+ 'numberposts' => -1,
</ins><span class="cx"> 'post_status' => 'inherit',
</span><span class="cx"> 'post_type' => 'attachment',
</span><span class="cx"> 'post_mime_type' => 'image',
</span><span class="cx"> 'order' => 'ASC',
</span><span class="cx"> 'orderby' => 'menu_order ID'
</span><del>- ) ) );
</del><ins>+ ) );
</ins><span class="cx">
</span><span class="cx"> // If there is more than 1 attachment in a gallery...
</span><del>- if ( count( $attachments ) > 1 ) {
- foreach ( $attachments as $k => $attachment ) {
- if ( $attachment->ID == $post->ID )
</del><ins>+ if ( count( $attachment_ids ) > 1 ) {
+ foreach ( $attachment_ids as $attachment_id ) {
+ if ( $attachment_id == $post->ID ) {
+ $next_id = current( $attachment_ids );
</ins><span class="cx"> break;
</span><ins>+ }
</ins><span class="cx"> }
</span><del>- $k++;
</del><span class="cx">
</span><span class="cx"> // get the URL of the next image attachment...
</span><del>- if ( isset( $attachments[ $k ] ) )
- $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
</del><ins>+ if ( $next_id )
+ $next_attachment_url = get_attachment_link( $next_id );
</ins><span class="cx">
</span><span class="cx"> // or get the URL of the first image attachment.
</span><span class="cx"> else
</span><del>- $next_attachment_url = get_attachment_link( $attachments[0]->ID );
</del><ins>+ $next_attachment_url = get_attachment_link( array_shift( $attachment_ids ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> printf( '<a href="%1$s" title="%2$s" rel="attachment">%3$s</a>',
</span></span></pre>
</div>
</div>
</body>
</html>