<!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>[25814] trunk/src/wp-content/themes/twentyfourteen: Twenty Fourteen: cleanup, props iamtakashi.</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/25814">25814</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-10-16 18:28:11 +0000 (Wed, 16 Oct 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Fourteen: cleanup, props iamtakashi. Fixes <a href="http://core.trac.wordpress.org/ticket/25613">#25613</a>.
* With the ephemera widget in place, `content-recent-formatted-post.php` is unused, see <a href="http://core.trac.wordpress.org/ticket/25028">#25028</a>.
* We're no longe filtering formatted posts from the main query, see <a href="http://core.trac.wordpress.org/ticket/25330">#25330</a>.
* Fix a typo.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfunctionsphp">trunk/src/wp-content/themes/twentyfourteen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenincfeaturedcontentphp">trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentrecentformattedpostphp">trunk/src/wp-content/themes/twentyfourteen/content-recent-formatted-post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyfourteencontentrecentformattedpostphp"></a>
<div class="delfile"><h4>Deleted: trunk/src/wp-content/themes/twentyfourteen/content-recent-formatted-post.php (25813 => 25814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/content-recent-formatted-post.php 2013-10-16 18:26:04 UTC (rev 25813)
+++ trunk/src/wp-content/themes/twentyfourteen/content-recent-formatted-post.php 2013-10-16 18:28:11 UTC (rev 25814)
</span><span class="lines">@@ -1,69 +0,0 @@
</span><del>-<?php
-/**
- * The template to display recent Featured Posts
- *
- * @package WordPress
- * @subpackage Twenty_Fourteen
- * @since Twenty Fourteen 1.0
- */
-if ( isset( $GLOBALS['content_width'] ) )
- $GLOBALS['content_width'] = 306;
-
-$images = get_posts( array(
- 'post_parent' => get_post()->post_parent,
- 'fields' => 'ids',
- 'numberposts' => -1,
- 'post_status' => 'inherit',
- 'post_type' => 'attachment',
- 'post_mime_type' => 'image',
- 'order' => 'ASC',
- 'orderby' => 'menu_order ID'
-) );
-$total_images = count( $images );
-?>
-
-<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
- <div class="entry-content">
- <?php
- if ( has_post_format( 'gallery' ) ) :
- if ( has_post_thumbnail() ) :
- $featured_image = get_the_post_thumbnail( get_the_ID(), 'featured-thumbnail-formatted' );
- elseif ( $total_images > 0 ) :
- $image = array_shift( $images );
- $featured_image = wp_get_attachment_image( $image, 'featured-thumbnail-formatted' );
- ?>
- <a href="<?php the_permalink(); ?>"><?php echo $featured_image; ?></a>
- <p class="wp-caption-text">
- <?php
- printf( _n( 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photo</a>.', 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photos</a>.', $total_images, 'twentyfourteen' ),
- esc_url( get_permalink() ),
- number_format_i18n( $total_images )
- );
- ?>
- </p>
- <?php
- else :
- the_excerpt();
- endif;
- else :
- the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyfourteen' ) );
- endif;
- ?>
- </div><!-- .entry-content -->
-
- <header class="entry-header">
- <div class="entry-meta">
- <?php
- if ( ! has_post_format( 'link' ) ) :
- the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
- endif;
-
- twentyfourteen_posted_on();
-
- if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
- ?>
- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
- <?php endif; ?>
- </div><!-- .entry-meta -->
- </header><!-- .entry-header -->
-</article><!-- #post-## -->
</del></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/functions.php (25813 => 25814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/functions.php 2013-10-16 18:26:04 UTC (rev 25813)
+++ trunk/src/wp-content/themes/twentyfourteen/functions.php 2013-10-16 18:28:11 UTC (rev 25814)
</span><span class="lines">@@ -357,83 +357,6 @@
</span><span class="cx"> endif;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Get recent formatted posts that are not featured in Featured Content area.
- *
- * @since Twenty Fourteen 1.0
- *
- * @return object WP_Query
- */
-function twentyfourteen_get_recent( $post_format ) {
- $args = array(
- 'order' => 'DESC',
- 'ignore_sticky_posts' => 1,
- 'posts_per_page' => 2,
- 'tax_query' => array(
- array(
- 'taxonomy' => 'post_format',
- 'terms' => array( $post_format ),
- 'field' => 'slug',
- 'operator' => 'IN',
- ),
- ),
- 'no_found_rows' => true,
- );
-
- $featured_posts = twentyfourteen_get_featured_posts();
-
- if ( is_array( $featured_posts ) && ! empty( $featured_posts ) )
- $args['post__not_in'] = wp_list_pluck( $featured_posts, 'ID' );
-
- return new WP_Query( $args );
-}
-
-/**
- * Filter the home page posts, and remove formatted posts visible in the sidebar from it
- *
- * @since Twenty Fourteen 1.0
- *
- * @return void
- */
-function twentyfourteen_pre_get_posts( $query ) {
- // Bail if not home, not a query, not main query.
- if ( ! $query->is_main_query() || is_admin() )
- return;
-
- // Only on the home page
- if ( $query->is_home() ) {
- $exclude_ids = array();
-
- $videos = twentyfourteen_get_recent( 'post-format-video' );
- $images = twentyfourteen_get_recent( 'post-format-image' );
- $galleries = twentyfourteen_get_recent( 'post-format-gallery' );
- $asides = twentyfourteen_get_recent( 'post-format-aside' );
- $links = twentyfourteen_get_recent( 'post-format-link' );
- $quotes = twentyfourteen_get_recent( 'post-format-quote' );
-
- foreach ( $videos->posts as $post )
- $exclude_ids[] = $post->ID;
-
- foreach ( $images->posts as $post )
- $exclude_ids[] = $post->ID;
-
- foreach ( $galleries->posts as $post )
- $exclude_ids[] = $post->ID;
-
- foreach ( $asides->posts as $post )
- $exclude_ids[] = $post->ID;
-
- foreach ( $links->posts as $post )
- $exclude_ids[] = $post->ID;
-
- foreach ( $quotes->posts as $post )
- $exclude_ids[] = $post->ID;
-
- $query->set( 'post__not_in', $exclude_ids );
- }
-}
-add_action( 'pre_get_posts', 'twentyfourteen_pre_get_posts' );
-
-/**
</del><span class="cx"> * Extend the default WordPress body classes.
</span><span class="cx"> *
</span><span class="cx"> * Adds body classes to denote:
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenincfeaturedcontentphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php (25813 => 25814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php 2013-10-16 18:26:04 UTC (rev 25813)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php 2013-10-16 18:28:11 UTC (rev 25814)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> * All custom functionality will be hooked into the "init" action.
</span><span class="cx"> */
</span><span class="cx"> public static function setup() {
</span><del>- add_action( 'init', array( __CLASS____, 'init' ), 30 );
</del><ins>+ add_action( 'init', array( __CLASS__, 'init' ), 30 );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>