<!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>[26556] trunk/src/wp-content/themes/twentyfourteen: Twenty Fourteen: update comment blocks to match inline docs standards.</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/26556">26556</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-12-03 17:05:53 +0000 (Tue, 03 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Fourteen: update comment blocks to match inline docs standards. Props DrewAPicture, see <a href="http://core.trac.wordpress.org/ticket/25837">#25837</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteenarchivephp">trunk/src/wp-content/themes/twentyfourteen/archive.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenauthorphp">trunk/src/wp-content/themes/twentyfourteen/author.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencategoryphp">trunk/src/wp-content/themes/twentyfourteen/category.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentfeaturedpostphp">trunk/src/wp-content/themes/twentyfourteen/content-featured-post.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentpagephp">trunk/src/wp-content/themes/twentyfourteen/content-page.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfeaturedcontentphp">trunk/src/wp-content/themes/twentyfourteen/featured-content.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfunctionsphp">trunk/src/wp-content/themes/twentyfourteen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenimagephp">trunk/src/wp-content/themes/twentyfourteen/image.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteeninccustomheaderphp">trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteeninccustomizerphp">trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenincfeaturedcontentphp">trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteeninctemplatetagsphp">trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenincwidgetsphp">trunk/src/wp-content/themes/twentyfourteen/inc/widgets.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenindexphp">trunk/src/wp-content/themes/twentyfourteen/index.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenpagetemplatescontributorsphp">trunk/src/wp-content/themes/twentyfourteen/page-templates/contributors.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenpagetemplatesfullwidthphp">trunk/src/wp-content/themes/twentyfourteen/page-templates/full-width.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenpagephp">trunk/src/wp-content/themes/twentyfourteen/page.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteensearchphp">trunk/src/wp-content/themes/twentyfourteen/search.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteensinglephp">trunk/src/wp-content/themes/twentyfourteen/single.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteentagphp">trunk/src/wp-content/themes/twentyfourteen/tag.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteentaxonomypost_formatphp">trunk/src/wp-content/themes/twentyfourteen/taxonomy-post_format.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyfourteenarchivephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/archive.php (26555 => 26556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/archive.php 2013-12-03 17:01:00 UTC (rev 26555)
+++ trunk/src/wp-content/themes/twentyfourteen/archive.php 2013-12-03 17:05:53 UTC (rev 26556)
</span><span class="lines">@@ -45,14 +45,22 @@
</span><span class="cx"> </header><!-- .page-header -->
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- while ( have_posts() ) :
- the_post();
</del><ins>+ // Start the Loop.
+ while ( have_posts() ) : the_post();
</ins><span class="cx">
</span><ins>+ /*
+ * Include the post format-specific template for the content. If you want to
+ * use this in a child theme, then include a file called called content-___.php
+ * (where ___ is the post format) and that will be used instead.
+ */
</ins><span class="cx"> get_template_part( 'content', get_post_format() );
</span><ins>+
</ins><span class="cx"> endwhile;
</span><ins>+ // Previous/next page navigation.
</ins><span class="cx"> twentyfourteen_paging_nav();
</span><span class="cx">
</span><span class="cx"> else :
</span><ins>+ // If no content, include the "No posts found" template.
</ins><span class="cx"> get_template_part( 'content', 'none' );
</span><span class="cx">
</span><span class="cx"> endif;
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenauthorphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/author.php (26555 => 26556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/author.php 2013-12-03 17:01:00 UTC (rev 26555)
+++ trunk/src/wp-content/themes/twentyfourteen/author.php 2013-12-03 17:05:53 UTC (rev 26556)
</span><span class="lines">@@ -45,14 +45,22 @@
</span><span class="cx"> */
</span><span class="cx"> rewind_posts();
</span><span class="cx">
</span><del>- while ( have_posts() ) :
- the_post();
</del><ins>+ // Start the Loop.
+ while ( have_posts() ) : the_post();
</ins><span class="cx">
</span><ins>+ /*
+ * Include the post format-specific template for the content. If you want to
+ * use this in a child theme, then include a file called called content-___.php
+ * (where ___ is the post format) and that will be used instead.
+ */
</ins><span class="cx"> get_template_part( 'content', get_post_format() );
</span><ins>+
</ins><span class="cx"> endwhile;
</span><ins>+ // Previous/next page navigation.
</ins><span class="cx"> twentyfourteen_paging_nav();
</span><span class="cx">
</span><span class="cx"> else :
</span><ins>+ // If no content, include the "No posts found" template.
</ins><span class="cx"> get_template_part( 'content', 'none' );
</span><span class="cx">
</span><span class="cx"> endif;
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencategoryphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/category.php (26555 => 26556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/category.php 2013-12-03 17:01:00 UTC (rev 26555)
+++ trunk/src/wp-content/themes/twentyfourteen/category.php 2013-12-03 17:05:53 UTC (rev 26556)
</span><span class="lines">@@ -29,14 +29,22 @@
</span><span class="cx"> </header><!-- .archive-header -->
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- while ( have_posts() ) :
- the_post();
</del><ins>+ // Start the Loop.
+ while ( have_posts() ) : the_post();
</ins><span class="cx">
</span><del>- get_template_part( 'content', get_post_format() );
</del><ins>+ /*
+ * Include the post format-specific template for the content. If you want to
+ * use this in a child theme, then include a file called called content-___.php
+ * (where ___ is the post format) and that will be used instead.
+ */
+ get_template_part( 'content', get_post_format() );
+
</ins><span class="cx"> endwhile;
</span><ins>+ // Previous/next page navigation.
</ins><span class="cx"> twentyfourteen_paging_nav();
</span><span class="cx">
</span><span class="cx"> else :
</span><ins>+ // If no content, include the "No posts found" template.
</ins><span class="cx"> get_template_part( 'content', 'none' );
</span><span class="cx">
</span><span class="cx"> endif;
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentfeaturedpostphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/content-featured-post.php (26555 => 26556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/content-featured-post.php 2013-12-03 17:01:00 UTC (rev 26555)
+++ trunk/src/wp-content/themes/twentyfourteen/content-featured-post.php 2013-12-03 17:05:53 UTC (rev 26556)
</span><span class="lines">@@ -11,6 +11,7 @@
</span><span class="cx"> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx"> <a class="post-thumbnail" href="<?php the_permalink(); ?>" rel="<?php the_ID(); ?>">
</span><span class="cx"> <?php
</span><ins>+ // Output the featured image.
</ins><span class="cx"> if ( has_post_thumbnail() ) :
</span><span class="cx"> if ( 'grid' == get_theme_mod( 'featured_content_layout' ) ) {
</span><span class="cx"> the_post_thumbnail();
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentpagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/content-page.php (26555 => 26556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/content-page.php 2013-12-03 17:01:00 UTC (rev 26555)
+++ trunk/src/wp-content/themes/twentyfourteen/content-page.php 2013-12-03 17:05:53 UTC (rev 26556)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx">
</span><span class="cx"> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx"> <?php
</span><ins>+ // Page thumbnail and title.
</ins><span class="cx"> twentyfourteen_post_thumbnail();
</span><span class="cx"> the_title( '<header class="entry-header"><h1 class="entry-title">', '</h1></header><!-- .entry-header -->' );
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenfeaturedcontentphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/featured-content.php (26555 => 26556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/featured-content.php 2013-12-03 17:01:00 UTC (rev 26555)
+++ trunk/src/wp-content/themes/twentyfourteen/featured-content.php 2013-12-03 17:05:53 UTC (rev 26556)
</span><span class="lines">@@ -11,15 +11,26 @@
</span><span class="cx"> <div id="featured-content" class="featured-content">
</span><span class="cx"> <div class="featured-content-inner">
</span><span class="cx"> <?php
</span><ins>+ /**
+ * Fires before the Twenty Fourteen featured content.
+ *
+ * @since Twenty Fourteen 1.0
+ */
</ins><span class="cx"> do_action( 'twentyfourteen_featured_posts_before' );
</span><span class="cx">
</span><span class="cx"> $featured_posts = twentyfourteen_get_featured_posts();
</span><span class="cx"> foreach ( (array) $featured_posts as $order => $post ) :
</span><span class="cx"> setup_postdata( $post );
</span><span class="cx">
</span><ins>+ // Include the featured content template.
</ins><span class="cx"> get_template_part( 'content', 'featured-post' );
</span><span class="cx"> endforeach;
</span><span class="cx">
</span><ins>+ /**
+ * Fires after the Twenty Fourteen featured content.
+ *
+ * @since Twenty Fourteen 1.0
+ */
</ins><span class="cx"> do_action( 'twentyfourteen_featured_posts_after' );
</span><span class="cx">
</span><span class="cx"> wp_reset_postdata();
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/functions.php (26555 => 26556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/functions.php 2013-12-03 17:01:00 UTC (rev 26555)
+++ trunk/src/wp-content/themes/twentyfourteen/functions.php 2013-12-03 17:05:53 UTC (rev 26556)
</span><span class="lines">@@ -6,13 +6,14 @@
</span><span class="cx"> * theme as custom template tags. Others are attached to action and filter
</span><span class="cx"> * hooks in WordPress to change core functionality.
</span><span class="cx"> *
</span><del>- * When using a child theme (see http://codex.wordpress.org/Theme_Development
- * and http://codex.wordpress.org/Child_Themes), you can override certain
- * functions (those wrapped in a function_exists() call) by defining them first
- * in your child theme's functions.php file. The child theme's functions.php
- * file is included before the parent theme's file, so the child theme
- * functions would be used.
</del><ins>+ * When using a child theme you can override certain functions (those wrapped
+ * in a function_exists() call) by defining them first in your child theme's
+ * functions.php file. The child theme's functions.php file is included before
+ * the parent theme's file, so the child theme functions would be used.
</ins><span class="cx"> *
</span><ins>+ * @link http://codex.wordpress.org/Theme_Development
+ * @link http://codex.wordpress.org/Child_Themes
+ *
</ins><span class="cx"> * Functions that are not pluggable (not wrapped in function_exists()) are
</span><span class="cx"> * instead attached to a filter or action hook.
</span><span class="cx"> *
</span><span class="lines">@@ -27,7 +28,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Set up the content width value based on the theme's design.
</span><span class="cx"> *
</span><del>- * @link twentyfourteen_content_width()
</del><ins>+ * @see twentyfourteen_content_width()
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Fourteen 1.0
</span><span class="cx"> */
</span><span class="lines">@@ -138,6 +139,13 @@
</span><span class="cx"> * @return array An array of WP_Post objects.
</span><span class="cx"> */
</span><span class="cx"> function twentyfourteen_get_featured_posts() {
</span><ins>+ /**
+ * Filter the featured posts to return in Twenty Fourteen.
+ *
+ * @since Twenty Fourteen 1.0
+ *
+ * @param array|bool $posts Array of featured posts, otherwise false.
+ */
</ins><span class="cx"> return apply_filters( 'twentyfourteen_get_featured_posts', array() );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -149,11 +157,12 @@
</span><span class="cx"> * @return bool Whether there are featured posts.
</span><span class="cx"> */
</span><span class="cx"> function twentyfourteen_has_featured_posts() {
</span><ins>+ /** This filter is documented in functions.php */
</ins><span class="cx"> return ! is_paged() && (bool) apply_filters( 'twentyfourteen_get_featured_posts', false );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Register two widget areas.
</del><ins>+ * Register three Twenty Fourteen widget areas.
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Fourteen 1.0
</span><span class="cx"> *
</span><span class="lines">@@ -214,7 +223,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Enqueue scripts and styles for front end.
</del><ins>+ * Enqueue scripts and styles for the front end.
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Fourteen 1.0
</span><span class="cx"> *
</span><span class="lines">@@ -280,6 +289,18 @@
</span><span class="cx"> */
</span><span class="cx"> function twentyfourteen_the_attached_image() {
</span><span class="cx"> $post = get_post();
</span><ins>+ /**
+ * Filter the default Twenty Fourteen attachment size.
+ *
+ * @since Twenty Fourteen 1.0
+ *
+ * @param array $dimensions {
+ * An array of height and width dimensions.
+ *
+ * @type int $height Height of the image in pixels. Default 1200.
+ * @type int $width Width of the image in pixels. Default 1200.
+ * }
+ */
</ins><span class="cx"> $attachment_size = apply_filters( 'twentyfourteen_attachment_size', array( 1200, 1200 ) );
</span><span class="cx"> $next_attachment_url = wp_get_attachment_url();
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenimagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/image.php (26555 => 26556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/image.php 2013-12-03 17:01:00 UTC (rev 26555)
+++ trunk/src/wp-content/themes/twentyfourteen/image.php 2013-12-03 17:05:53 UTC (rev 26556)
</span><span class="lines">@@ -7,6 +7,7 @@
</span><span class="cx"> * @since Twenty Fourteen 1.0
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+// Retrieve attachment metadata.
</ins><span class="cx"> $metadata = wp_get_attachment_metadata();
</span><span class="cx">
</span><span class="cx"> get_header();
</span><span class="lines">@@ -15,8 +16,10 @@
</span><span class="cx"> <section id="primary" class="content-area image-attachment">
</span><span class="cx"> <div id="content" class="site-content" role="main">
</span><span class="cx">
</span><del>- <?php while ( have_posts() ) : the_post(); ?>
-
</del><ins>+ <?php
+ // Start the Loop.
+ while ( have_posts() ) : the_post();
+ ?>
</ins><span class="cx"> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx"> <header class="entry-header">
</span><span class="cx"> <?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteeninccustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php (26555 => 26556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php 2013-12-03 17:01:00 UTC (rev 26555)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php 2013-12-03 17:05:53 UTC (rev 26556)
</span><span class="lines">@@ -17,6 +17,24 @@
</span><span class="cx"> * @uses twentyfourteen_admin_header_image()
</span><span class="cx"> */
</span><span class="cx"> function twentyfourteen_custom_header_setup() {
</span><ins>+ /**
+ * Filter Twenty Fourteen custom-header support arguments.
+ *
+ * @since Twenty Fourteen 1.0
+ *
+ * @param array $args {
+ * An array of custom-header support arguments.
+ *
+ * @type bool $header_text Whether to display custom header text. Default false.
+ * @type int $width Width in pixels of the custom header image. Default 1260.
+ * @type int $height Height in pixels of the custom header image. Default 240.
+ * @type bool $flex_height Whether to allow flexible-height header images. Default true.
+ * @type string $admin_head_callback Callback function used to style the image displayed in
+ * the Appearance > Header screen.
+ * @type string $admin_preview_callback Callback function used to create the custom header markup in
+ * the Appearance > Header screen.
+ * }
+ */
</ins><span class="cx"> add_theme_support( 'custom-header', apply_filters( 'twentyfourteen_custom_header_args', array(
</span><span class="cx"> 'header-text' => false,
</span><span class="cx"> 'width' => 1260,
</span><span class="lines">@@ -30,9 +48,9 @@
</span><span class="cx">
</span><span class="cx"> if ( ! function_exists( 'twentyfourteen_admin_header_style' ) ) :
</span><span class="cx"> /**
</span><del>- * Style the header image displayed on the Appearance > Header admin panel.
</del><ins>+ * Style the header image displayed on the Appearance > Header screen.
</ins><span class="cx"> *
</span><del>- * @link twentyfourteen_custom_header_setup().
</del><ins>+ * @see twentyfourteen_custom_header_setup()
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Fourteen 1.0
</span><span class="cx"> */
</span><span class="lines">@@ -65,9 +83,9 @@
</span><span class="cx">
</span><span class="cx"> if ( ! function_exists( 'twentyfourteen_admin_header_image' ) ) :
</span><span class="cx"> /**
</span><del>- * Create the custom header image markup displayed on the Appearance > Header admin panel.
</del><ins>+ * Create the custom header image markup displayed on the Appearance > Header screen.
</ins><span class="cx"> *
</span><del>- * @link twentyfourteen_custom_header_setup().
</del><ins>+ * @see twentyfourteen_custom_header_setup()
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Fourteen 1.0
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteeninccustomizerphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php (26555 => 26556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php 2013-12-03 17:01:00 UTC (rev 26555)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php 2013-12-03 17:05:53 UTC (rev 26556)
</span><span class="lines">@@ -72,16 +72,19 @@
</span><span class="cx"> add_action( 'customize_preview_init', 'twentyfourteen_customize_preview_js' );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Tweak the brightness of a color by adjusting the RGB values by the given interval.
</del><ins>+ * Tweak the brightness of a color by adjusting the RGB
+ * values by the given interval.
</ins><span class="cx"> *
</span><del>- * Use positive values of $steps to brighten the color and negative values to darken the color.
- * All three RGB values are modified by the specified steps, within the range of 0-255. The hue
- * is generally maintained unless the number of steps causes one value to be capped at 0 or 255.
</del><ins>+ * Use positive values of $steps to brighten the color and negative
+ * values to darken the color. All three RGB values are modified by
+ * the specified steps, within the range of 0-255. The hue is generally
+ * maintained unless the number of steps causes one value to be capped
+ * at 0 or 255.
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Fourteen 1.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $color The original color, in 3- or 6-digit hexadecimal form.
</span><del>- * @param int $steps The number of steps to adjust the color by, in RGB units.
</del><ins>+ * @param int $steps The number of steps to adjust the color by, in RGB units.
</ins><span class="cx"> * @return string $color The new color, in 6-digit hexadecimal form.
</span><span class="cx"> */
</span><span class="cx"> function twentyfourteen_adjust_color( $color, $steps ) {
</span><span class="lines">@@ -109,30 +112,30 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Returns a slightly lighter color than what is set as the theme's
</del><ins>+ * Return a slightly lighter color than what is set as the theme's
</ins><span class="cx"> * accent color.
</span><span class="cx"> *
</span><span class="cx"> * @since Twenty Fourteen 1.0
</span><span class="cx"> *
</span><del>- * @return string
</del><ins>+ * @return string Hex color.
</ins><span class="cx"> */
</span><span class="cx"> function twentyfourteen_accent_mid() {
</span><span class="cx"> return twentyfourteen_adjust_color( get_theme_mod( 'accent_color' ), 29 );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Returns a lighter color than what is set as the theme's accent color.
</del><ins>+ * Return a lighter color than what is set as the theme's accent color.
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Fourteen 1.0
</span><span class="cx"> *
</span><del>- * @return string
</del><ins>+ * @return string Hex color.
</ins><span class="cx"> */
</span><span class="cx"> function twentyfourteen_accent_light() {
</span><span class="cx"> return twentyfourteen_adjust_color( get_theme_mod( 'accent_color' ), 49 );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Caches the generated variants of the theme's accent color.
</del><ins>+ * Cache the generated variants of the theme's accent color.
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Fourteen 1.0
</span><span class="cx"> *
</span><span class="lines">@@ -324,7 +327,7 @@
</span><span class="cx"> add_action( 'wp_enqueue_scripts', 'twentyfourteen_customizer_styles' );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Adds contextual help to the Themes and Post edit screens.
</del><ins>+ * Add contextual help to the Themes and Post edit screens.
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Fourteen 1.0
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenincfeaturedcontentphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php (26555 => 26556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php 2013-12-03 17:01:00 UTC (rev 26555)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php 2013-12-03 17:05:53 UTC (rev 26556)
</span><span class="lines">@@ -2,37 +2,48 @@
</span><span class="cx"> /**
</span><span class="cx"> * Twenty Fourteen Featured Content
</span><span class="cx"> *
</span><del>- * This module allows you to define a subset of posts to be displayed in the
- * theme's Featured Content area.
</del><ins>+ * This module allows you to define a subset of posts to be displayed
+ * in the theme's Featured Content area.
</ins><span class="cx"> *
</span><del>- * For maximum compatibility with different methods of posting users will
- * designate a featured post tag to associate posts with. Since this tag now
- * has special meaning beyond that of a normal tags, users will have the
- * ability to hide it from the front-end of their site.
</del><ins>+ * For maximum compatibility with different methods of posting users
+ * will designate a featured post tag to associate posts with. Since
+ * this tag now has special meaning beyond that of a normal tags, users
+ * will have the ability to hide it from the front-end of their site.
</ins><span class="cx"> */
</span><span class="cx"> class Featured_Content {
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * The maximum number of posts that a Featured Content area can contain. We
- * define a default value here but themes can override this by defining a
- * "max_posts" entry in the second parameter passed in the call to
- * add_theme_support( 'featured-content' ).
</del><ins>+ * The maximum number of posts a Featured Content area can contain.
</ins><span class="cx"> *
</span><ins>+ * We define a default value here but themes can override
+ * this by defining a "max_posts" entry in the second parameter
+ * passed in the call to add_theme_support( 'featured-content' ).
+ *
</ins><span class="cx"> * @see Featured_Content::init()
</span><ins>+ *
+ * @since Twenty Fourteen 1.0
+ *
+ * @static
+ * @access public
+ * @var int
</ins><span class="cx"> */
</span><span class="cx"> public static $max_posts = 15;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Instantiate
</del><ins>+ * Instantiate.
</ins><span class="cx"> *
</span><span class="cx"> * All custom functionality will be hooked into the "init" action.
</span><ins>+ *
+ * @static
+ * @access public
+ * @since Twenty Fourteen 1.0
</ins><span class="cx"> */
</span><span class="cx"> public static function setup() {
</span><span class="cx"> add_action( 'init', array( __CLASS__, 'init' ), 30 );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Conditionally hook into WordPress
</del><ins>+ * Conditionally hook into WordPress.
</ins><span class="cx"> *
</span><span class="cx"> * Theme must declare that they support this module by adding
</span><span class="cx"> * add_theme_support( 'featured-content' ); during after_setup_theme.
</span><span class="lines">@@ -40,7 +51,9 @@
</span><span class="cx"> * If no theme support is found there is no need to hook into WordPress.
</span><span class="cx"> * We'll just return early instead.
</span><span class="cx"> *
</span><del>- * @uses Featured_Content::$max_posts
</del><ins>+ * @static
+ * @access public
+ * @since Twenty Fourteen 1.0
</ins><span class="cx"> */
</span><span class="cx"> public static function init() {
</span><span class="cx"> $theme_support = get_theme_support( 'featured-content' );
</span><span class="lines">@@ -85,6 +98,10 @@
</span><span class="cx"> *
</span><span class="cx"> * Has to run on wp_loaded so that the preview filters of the customizer
</span><span class="cx"> * have a chance to alter the value.
</span><ins>+ *
+ * @static
+ * @access public
+ * @since Twenty Fourteen 1.0
</ins><span class="cx"> */
</span><span class="cx"> public static function wp_loaded() {
</span><span class="cx"> if ( self::get_setting( 'hide-tag' ) ) {
</span><span class="lines">@@ -94,11 +111,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Get featured posts
</del><ins>+ * Get featured posts.
</ins><span class="cx"> *
</span><del>- * @uses Featured_Content::get_featured_post_ids()
</del><ins>+ * @static
+ * @access public
+ * @since Twenty Fourteen 1.0
</ins><span class="cx"> *
</span><del>- * @return array
</del><ins>+ * @return array Array of featured posts.
</ins><span class="cx"> */
</span><span class="cx"> public static function get_featured_posts() {
</span><span class="cx"> $post_ids = self::get_featured_post_ids();
</span><span class="lines">@@ -124,7 +143,11 @@
</span><span class="cx"> *
</span><span class="cx"> * Sets the "featured_content_ids" transient.
</span><span class="cx"> *
</span><del>- * @return array Array of post IDs
</del><ins>+ * @static
+ * @access public
+ * @since Twenty Fourteen 1.0
+ *
+ * @return array Array of post IDs.
</ins><span class="cx"> */
</span><span class="cx"> public static function get_featured_post_ids() {
</span><span class="cx"> // Return array of cached results if they exist.
</span><span class="lines">@@ -170,9 +193,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Returns an array with IDs of posts maked as sticky.
</del><ins>+ * Return an array with IDs of posts maked as sticky.
</ins><span class="cx"> *
</span><del>- * @return array
</del><ins>+ * @static
+ * @access public
+ * @since Twenty Fourteen 1.0
+ *
+ * @return array Array of sticky posts.
</ins><span class="cx"> */
</span><span class="cx"> public static function get_sticky_posts() {
</span><span class="cx"> $settings = self::get_setting();
</span><span class="lines">@@ -180,25 +207,33 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Delete transient
</del><ins>+ * Delete featured content ids transient.
</ins><span class="cx"> *
</span><span class="cx"> * Hooks in the "save_post" action.
</span><ins>+ *
</ins><span class="cx"> * @see Featured_Content::validate_settings().
</span><ins>+ *
+ * @static
+ * @access public
+ * @since Twenty Fourteen 1.0
</ins><span class="cx"> */
</span><span class="cx"> public static function delete_transient() {
</span><span class="cx"> delete_transient( 'featured_content_ids' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Exclude featured posts from the home page blog query
</del><ins>+ * Exclude featured posts from the home page blog query.
</ins><span class="cx"> *
</span><del>- * Filter the home page posts, and remove any featured post ID's from it. Hooked
- * onto the 'pre_get_posts' action, this changes the parameters of the query
- * before it gets any posts.
</del><ins>+ * Filter the home page posts, and remove any featured post ID's from it.
+ * Hooked onto the 'pre_get_posts' action, this changes the parameters of
+ * the query before it gets any posts.
</ins><span class="cx"> *
</span><del>- * @uses Featured_Content::get_featured_post_ids();
- * @param WP_Query $query
- * @return WP_Query Possibly modified WP_Query
</del><ins>+ * @static
+ * @access public
+ * @since Twenty Fourteen 1.0
+ *
+ * @param WP_Query $query WP_Query object.
+ * @return WP_Query Possibly-modified WP_Query.
</ins><span class="cx"> */
</span><span class="cx"> public static function pre_get_posts( $query ) {
</span><span class="cx">
</span><span class="lines">@@ -233,15 +268,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Reset tag option when the saved tag is deleted
</del><ins>+ * Reset tag option when the saved tag is deleted.
</ins><span class="cx"> *
</span><del>- * It's important to mention that the transient needs to be deleted, too.
- * While it may not be obvious by looking at the function alone, the transient
- * is deleted by Featured_Content::validate_settings().
</del><ins>+ * It's important to mention that the transient needs to be deleted,
+ * too. While it may not be obvious by looking at the function alone,
+ * the transient is deleted by Featured_Content::validate_settings().
</ins><span class="cx"> *
</span><span class="cx"> * Hooks in the "delete_post_tag" action.
</span><ins>+ *
</ins><span class="cx"> * @see Featured_Content::validate_settings().
</span><span class="cx"> *
</span><ins>+ * @static
+ * @access public
+ * @since Twenty Fourteen 1.0
+ *
</ins><span class="cx"> * @param int $tag_id The term_id of the tag that has been deleted.
</span><span class="cx"> * @return void
</span><span class="cx"> */
</span><span class="lines">@@ -258,13 +298,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Hide featured tag from displaying when global terms are queried from the front-end
</del><ins>+ * Hide featured tag from displaying when global terms are queried from the front-end.
</ins><span class="cx"> *
</span><span class="cx"> * Hooks into the "get_terms" filter.
</span><span class="cx"> *
</span><del>- * @param array $terms A list of term objects. This is the return value of get_terms().
</del><ins>+ * @static
+ * @access public
+ * @since Twenty Fourteen 1.0
+ *
+ * @param array $terms List of term objects. This is the return value of get_terms().
</ins><span class="cx"> * @param array $taxonomies An array of taxonomy slugs.
</span><del>- * @return array $terms
</del><ins>+ * @return array A filtered array of terms.
</ins><span class="cx"> *
</span><span class="cx"> * @uses Featured_Content::get_setting()
</span><span class="cx"> */
</span><span class="lines">@@ -295,14 +339,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Hide featured tag from display when terms associated with a post object are queried from the front-end
</del><ins>+ * Hide featured tag from display when terms associated with a post object
+ * are queried from the front-end.
</ins><span class="cx"> *
</span><span class="cx"> * Hooks into the "get_the_terms" filter.
</span><span class="cx"> *
</span><del>- * @param array $terms A list of term objects. This is the return value of get_the_terms().
- * @param int $id The ID field for the post object that terms are associated with.
</del><ins>+ * @static
+ * @access public
+ * @since Twenty Fourteen 1.0
+ *
+ * @param array $terms A list of term objects. This is the return value of get_the_terms().
+ * @param int $id The ID field for the post object that terms are associated with.
</ins><span class="cx"> * @param array $taxonomy An array of taxonomy slugs.
</span><del>- * @return array $terms
</del><ins>+ * @return array Filtered array of terms.
</ins><span class="cx"> *
</span><span class="cx"> * @uses Featured_Content::get_setting()
</span><span class="cx"> */
</span><span class="lines">@@ -333,10 +382,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Register custom setting on the Settings -> Reading screen
</del><ins>+ * Register custom setting on the Settings -> Reading screen.
</ins><span class="cx"> *
</span><del>- * @uses Featured_Content::render_form()
- * @uses Featured_Content::validate_settings()
</del><ins>+ * @static
+ * @access public
+ * @since Twenty Fourteen 1.0
</ins><span class="cx"> *
</span><span class="cx"> * @return void
</span><span class="cx"> */
</span><span class="lines">@@ -347,6 +397,10 @@
</span><span class="cx"> /**
</span><span class="cx"> * Add settings to the Customizer.
</span><span class="cx"> *
</span><ins>+ * @static
+ * @access public
+ * @since Twenty Fourteen 1.0
+ *
</ins><span class="cx"> * @param WP_Customize_Manager $wp_customize Theme Customizer object.
</span><span class="cx"> */
</span><span class="cx"> public static function customize_register( $wp_customize ) {
</span><span class="lines">@@ -386,6 +440,8 @@
</span><span class="cx"> /**
</span><span class="cx"> * Enqueue the tag suggestion script.
</span><span class="cx"> *
</span><ins>+ * @static
+ * @access public
</ins><span class="cx"> * @since Twenty Fourteen 1.0
</span><span class="cx"> */
</span><span class="cx"> public static function enqueue_scripts() {
</span><span class="lines">@@ -393,16 +449,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Get settings
</del><ins>+ * Get featured content settings.
</ins><span class="cx"> *
</span><del>- * Get all settings recognized by this module. This function will return
- * all settings whether or not they have been stored in the database yet.
- * This ensures that all keys are available at all times.
</del><ins>+ * Get all settings recognized by this module. This function
+ * will return all settings whether or not they have been stored
+ * in the database yet. This ensures that all keys are available
+ * at all times.
</ins><span class="cx"> *
</span><del>- * In the event that you only require one setting, you may pass its name
- * as the first parameter to the function and only that value will be returned.
</del><ins>+ * In the event that you only require one setting, you may pass
+ * its name as the first parameter to the function and only that
+ * value will be returned.
</ins><span class="cx"> *
</span><del>- * @uses Featured_Content::sanitize_quantity()
</del><ins>+ * @static
+ * @access public
+ * @since Twenty Fourteen 1.0
</ins><span class="cx"> *
</span><span class="cx"> * @param string $key The key of a recognized setting.
</span><span class="cx"> * @return mixed Array of all settings by default. A single value if passed as first parameter.
</span><span class="lines">@@ -429,18 +489,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Validate settings
</del><ins>+ * Validate featured content settings.
</ins><span class="cx"> *
</span><del>- * Make sure that all user supplied content is in an
- * expected format before saving to the database. This
- * function will also delete the transient set in
- * Featured_Content::get_featured_content().
</del><ins>+ * Make sure that all user supplied content is in an expected
+ * format before saving to the database. This function will also
+ * delete the transient set in Featured_Content::get_featured_content().
</ins><span class="cx"> *
</span><del>- * @uses Featured_Content::self::sanitize_quantity()
- * @uses Featured_Content::self::delete_transient()
</del><ins>+ * @static
+ * @access public
+ * @since Twenty Fourteen 1.0
</ins><span class="cx"> *
</span><del>- * @param array $input
- * @return array $output
</del><ins>+ * @param array $input Array of settings input.
+ * @return array Validated settings output.
</ins><span class="cx"> */
</span><span class="cx"> public static function validate_settings( $input ) {
</span><span class="cx"> $output = array();
</span><span class="lines">@@ -469,18 +529,21 @@
</span><span class="cx">
</span><span class="cx"> $output['hide-tag'] = isset( $input['hide-tag'] ) && $input['hide-tag'] ? 1 : 0;
</span><span class="cx">
</span><ins>+ // Delete the featured post ids transient.
</ins><span class="cx"> self::delete_transient();
</span><span class="cx">
</span><span class="cx"> return $output;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Sanitize quantity
</del><ins>+ * Sanitize quantity of featured posts.
</ins><span class="cx"> *
</span><ins>+ * @static
+ * @access public
+ * @since Twenty Fourteen 1.0
+ *
</ins><span class="cx"> * @param int $input The value to sanitize.
</span><span class="cx"> * @return int A number between 1 and FeaturedContent::$max_posts.
</span><del>- *
- * @uses Featured_Content::$max_posts
</del><span class="cx"> */
</span><span class="cx"> public static function sanitize_quantity( $input ) {
</span><span class="cx"> $quantity = absint( $input );
</span><span class="lines">@@ -493,6 +556,7 @@
</span><span class="cx">
</span><span class="cx"> return $quantity;
</span><span class="cx"> }
</span><del>-}
</del><span class="cx">
</span><ins>+} // Featured_Content
+
</ins><span class="cx"> Featured_Content::setup();
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteeninctemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php (26555 => 26556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php 2013-12-03 17:01:00 UTC (rev 26555)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php 2013-12-03 17:05:53 UTC (rev 26556)
</span><span class="lines">@@ -36,7 +36,8 @@
</span><span class="cx"> $format = $GLOBALS['wp_rewrite']->using_index_permalinks() && ! strpos( $pagenum_link, 'index.php' ) ? 'index.php/' : '';
</span><span class="cx"> $format .= $GLOBALS['wp_rewrite']->using_permalinks() ? user_trailingslashit( 'page/%#%', 'paged' ) : '?paged=%#%';
</span><span class="cx">
</span><del>- $links = paginate_links( array(
</del><ins>+ // Set up paginated links.
+ $links = paginate_links( array(
</ins><span class="cx"> 'base' => $pagenum_link,
</span><span class="cx"> 'format' => $format,
</span><span class="cx"> 'total' => $GLOBALS['wp_query']->max_num_pages,
</span><span class="lines">@@ -109,6 +110,7 @@
</span><span class="cx"> echo '<span class="featured-post">' . __( 'Sticky', 'twentyfourteen' ) . '</span>';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Set up and print post meta information.
</ins><span class="cx"> printf( __( '<span class="entry-date"><a href="%1$s" rel="bookmark"><time class="entry-date" datetime="%2$s">%3$s</time></a></span> <span class="byline"><span class="author vcard"><a class="url fn n" href="%4$s" rel="author">%5$s</a></span></span>', 'twentyfourteen' ),
</span><span class="cx"> esc_url( get_permalink() ),
</span><span class="cx"> esc_attr( get_the_date( 'c' ) ),
</span><span class="lines">@@ -149,7 +151,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Flush out the transients used in twentyfourteen_categorized_blog
</del><ins>+ * Flush out the transients used in twentyfourteen_categorized_blog.
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Fourteen 1.0
</span><span class="cx"> *
</span><span class="lines">@@ -163,9 +165,11 @@
</span><span class="cx"> add_action( 'save_post', 'twentyfourteen_category_transient_flusher' );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Displays an optional post thumbnail, with an anchor element
- * when on index views, and a div element when on a single view.
</del><ins>+ * Display an optional post thumbnail on a single view.
</ins><span class="cx"> *
</span><ins>+ * Adds an anchor element to the post thumbnail, when on
+ * index views, and a div element when on a single view.
+ *
</ins><span class="cx"> * @since Twenty Fourteen 1.0
</span><span class="cx"> *
</span><span class="cx"> * @return void
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenincwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/inc/widgets.php (26555 => 26556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/inc/widgets.php 2013-12-03 17:01:00 UTC (rev 26555)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/widgets.php 2013-12-03 17:05:53 UTC (rev 26556)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * The supported post formats.
</span><span class="cx"> *
</span><ins>+ * @access private
</ins><span class="cx"> * @since Twenty Fourteen 1.0
</span><span class="cx"> *
</span><span class="cx"> * @var array
</span><span class="lines">@@ -25,6 +26,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Pluralized post format strings.
</span><span class="cx"> *
</span><ins>+ * @access private
</ins><span class="cx"> * @since Twenty Fourteen 1.0
</span><span class="cx"> *
</span><span class="cx"> * @var array
</span><span class="lines">@@ -65,9 +67,10 @@
</span><span class="cx"> /**
</span><span class="cx"> * Output the HTML for this widget.
</span><span class="cx"> *
</span><ins>+ * @access public
</ins><span class="cx"> * @since Twenty Fourteen 1.0
</span><span class="cx"> *
</span><del>- * @param array $args An array of standard parameters for widgets in this theme.
</del><ins>+ * @param array $args An array of standard parameters for widgets in this theme.
</ins><span class="cx"> * @param array $instance An array of settings for this widget instance.
</span><span class="cx"> * @return void Echoes its output.
</span><span class="cx"> */
</span><span class="lines">@@ -219,14 +222,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Deal with the settings when they are saved by the admin. Here is where
- * any validation should happen.
</del><ins>+ * Deal with the settings when they are saved by the admin.
</ins><span class="cx"> *
</span><ins>+ * Here is where any validation should happen.
+ *
</ins><span class="cx"> * @since Twenty Fourteen 1.0
</span><span class="cx"> *
</span><del>- * @param array $new_instance
- * @param array $instance
- * @return array
</del><ins>+ * @param array $new_instance New widget instance.
+ * @param array $instance Original widget instance.
+ * @return array Updated widget instance.
</ins><span class="cx"> */
</span><span class="cx"> function update( $new_instance, $instance ) {
</span><span class="cx"> $instance['title'] = strip_tags( $new_instance['title'] );
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenindexphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/index.php (26555 => 26556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/index.php 2013-12-03 17:01:00 UTC (rev 26555)
+++ trunk/src/wp-content/themes/twentyfourteen/index.php 2013-12-03 17:05:53 UTC (rev 26556)
</span><span class="lines">@@ -2,10 +2,11 @@
</span><span class="cx"> /**
</span><span class="cx"> * The main template file
</span><span class="cx"> *
</span><del>- * This is the most generic template file in a WordPress theme
- * and one of the two required files for a theme (the other being style.css).
- * It is used to display a page when nothing more specific matches a query.
- * E.g., it puts together the home page when no home.php file exists.
</del><ins>+ * This is the most generic template file in a WordPress theme and one
+ * of the two required files for a theme (the other being style.css).
+ * It is used to display a page when nothing more specific matches a query,
+ * e.g., it puts together the home page when no home.php file exists.
+ *
</ins><span class="cx"> * @link http://codex.wordpress.org/Template_Hierarchy
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="lines">@@ -18,9 +19,10 @@
</span><span class="cx"> <div id="main-content" class="main-content">
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- if ( is_front_page() && twentyfourteen_has_featured_posts() ) {
</del><ins>+ if ( is_front_page() && twentyfourteen_has_featured_posts() ) :
+ // Include the featured content template.
</ins><span class="cx"> get_template_part( 'featured-content' );
</span><del>- }
</del><ins>+ endif;
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <div id="primary" class="content-area">
</span><span class="lines">@@ -28,14 +30,22 @@
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> if ( have_posts() ) :
</span><del>- while ( have_posts() ) :
- the_post();
</del><ins>+ // Start the Loop.
+ while ( have_posts() ) : the_post();
</ins><span class="cx">
</span><ins>+ /*
+ * Include the post format-specific template for the content. If you want to
+ * use this in a child theme, then include a file called called content-___.php
+ * (where ___ is the post format) and that will be used instead.
+ */
</ins><span class="cx"> get_template_part( 'content', get_post_format() );
</span><ins>+
</ins><span class="cx"> endwhile;
</span><ins>+ // Previous/next post navigation.
</ins><span class="cx"> twentyfourteen_paging_nav();
</span><span class="cx">
</span><span class="cx"> else :
</span><ins>+ // If no content, include the "No posts found" template.
</ins><span class="cx"> get_template_part( 'content', 'none' );
</span><span class="cx">
</span><span class="cx"> endif;
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenpagetemplatescontributorsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/page-templates/contributors.php (26555 => 26556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/page-templates/contributors.php 2013-12-03 17:01:00 UTC (rev 26555)
+++ trunk/src/wp-content/themes/twentyfourteen/page-templates/contributors.php 2013-12-03 17:05:53 UTC (rev 26556)
</span><span class="lines">@@ -13,6 +13,7 @@
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> if ( is_front_page() && twentyfourteen_has_featured_posts() ) {
</span><ins>+ // Include the featured content template.
</ins><span class="cx"> get_template_part( 'featured-content' );
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="lines">@@ -20,14 +21,15 @@
</span><span class="cx"> <div id="primary" class="content-area">
</span><span class="cx"> <div id="content" class="site-content" role="main">
</span><span class="cx"> <?php
</span><del>- while ( have_posts() ) :
- the_post();
</del><ins>+ // Start the Loop.
+ while ( have_posts() ) : the_post();
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx"> <?php
</span><span class="cx"> the_title( '<header class="entry-header"><h1 class="entry-title">', '</h1></header><!-- .entry-header -->' );
</span><span class="cx">
</span><ins>+ // Output the authors list.
</ins><span class="cx"> twentyfourteen_list_authors();
</span><span class="cx">
</span><span class="cx"> edit_post_link( __( 'Edit', 'twentyfourteen' ), '<footer class="entry-meta"><span class="edit-link">', '</span></footer>' );
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenpagetemplatesfullwidthphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/page-templates/full-width.php (26555 => 26556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/page-templates/full-width.php 2013-12-03 17:01:00 UTC (rev 26555)
+++ trunk/src/wp-content/themes/twentyfourteen/page-templates/full-width.php 2013-12-03 17:05:53 UTC (rev 26556)
</span><span class="lines">@@ -13,6 +13,7 @@
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> if ( is_front_page() && twentyfourteen_has_featured_posts() ) {
</span><ins>+ // Include the featured content template.
</ins><span class="cx"> get_template_part( 'featured-content' );
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="lines">@@ -20,9 +21,10 @@
</span><span class="cx"> <div id="primary" class="content-area">
</span><span class="cx"> <div id="content" class="site-content" role="main">
</span><span class="cx"> <?php
</span><del>- while ( have_posts() ) :
- the_post();
</del><ins>+ // Start the Loop.
+ while ( have_posts() ) : the_post();
</ins><span class="cx">
</span><ins>+ // Include the page content template.
</ins><span class="cx"> get_template_part( 'content', 'page' );
</span><span class="cx">
</span><span class="cx"> // If comments are open or we have at least one comment, load up the comment template.
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenpagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/page.php (26555 => 26556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/page.php 2013-12-03 17:01:00 UTC (rev 26555)
+++ trunk/src/wp-content/themes/twentyfourteen/page.php 2013-12-03 17:05:53 UTC (rev 26556)
</span><span class="lines">@@ -3,8 +3,8 @@
</span><span class="cx"> * The template for displaying all pages
</span><span class="cx"> *
</span><span class="cx"> * This is the template that displays all pages by default.
</span><del>- * Please note that this is the WordPress construct of pages and that other 'pages'
- * on your WordPress site will use a different template.
</del><ins>+ * Please note that this is the WordPress construct of pages and that
+ * other 'pages' on your WordPress site will use a different template.
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Fourteen
</span><span class="lines">@@ -16,23 +16,25 @@
</span><span class="cx"> <div id="main-content" class="main-content">
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- if ( is_front_page() && twentyfourteen_has_featured_posts() ) {
</del><ins>+ if ( is_front_page() && twentyfourteen_has_featured_posts() ) :\
+ // Include the featured content template.
</ins><span class="cx"> get_template_part( 'featured-content' );
</span><del>- }
</del><ins>+ endif;
</ins><span class="cx"> ?>
</span><span class="cx"> <div id="primary" class="content-area">
</span><span class="cx"> <div id="content" class="site-content" role="main">
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- while ( have_posts() ) :
- the_post();
</del><ins>+ // Start the Loop.
+ while ( have_posts() ) : the_post();
</ins><span class="cx">
</span><ins>+ // Include the page content template.
</ins><span class="cx"> get_template_part( 'content', 'page' );
</span><span class="cx">
</span><span class="cx"> // If comments are open or we have at least one comment, load up the comment template.
</span><del>- if ( comments_open() || get_comments_number() ) {
</del><ins>+ if ( comments_open() || get_comments_number() ) :
</ins><span class="cx"> comments_template();
</span><del>- }
</del><ins>+ endif;
</ins><span class="cx"> endwhile;
</span><span class="cx"> ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteensearchphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/search.php (26555 => 26556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/search.php 2013-12-03 17:01:00 UTC (rev 26555)
+++ trunk/src/wp-content/themes/twentyfourteen/search.php 2013-12-03 17:05:53 UTC (rev 26556)
</span><span class="lines">@@ -18,15 +18,23 @@
</span><span class="cx"> <h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'twentyfourteen' ), get_search_query() ); ?></h1>
</span><span class="cx"> </header><!-- .page-header -->
</span><span class="cx">
</span><del>- <?php
- while ( have_posts() ) :
- the_post();
</del><ins>+ <?php
+ // Start the Loop.
+ while ( have_posts() ) : the_post();
</ins><span class="cx">
</span><ins>+ /*
+ * Include the post format-specific template for the content. If you want to
+ * use this in a child theme, then include a file called called content-___.php
+ * (where ___ is the post format) and that will be used instead.
+ */
</ins><span class="cx"> get_template_part( 'content', get_post_format() );
</span><ins>+
</ins><span class="cx"> endwhile;
</span><ins>+ // Previous/next post navigation.
</ins><span class="cx"> twentyfourteen_paging_nav();
</span><span class="cx">
</span><span class="cx"> else :
</span><ins>+ // If no content, include the "No posts found" template.
</ins><span class="cx"> get_template_part( 'content', 'none' );
</span><span class="cx">
</span><span class="cx"> endif;
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteensinglephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/single.php (26555 => 26556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/single.php 2013-12-03 17:01:00 UTC (rev 26555)
+++ trunk/src/wp-content/themes/twentyfourteen/single.php 2013-12-03 17:05:53 UTC (rev 26556)
</span><span class="lines">@@ -12,11 +12,17 @@
</span><span class="cx"> <div id="primary" class="content-area">
</span><span class="cx"> <div id="content" class="site-content" role="main">
</span><span class="cx"> <?php
</span><del>- while ( have_posts() ) :
- the_post();
</del><ins>+ // Start the Loop.
+ while ( have_posts() ) : the_post();
</ins><span class="cx">
</span><ins>+ /*
+ * Include the post format-specific template for the content. If you want to
+ * use this in a child theme, then include a file called called content-___.php
+ * (where ___ is the post format) and that will be used instead.
+ */
</ins><span class="cx"> get_template_part( 'content', get_post_format() );
</span><span class="cx">
</span><ins>+ // Previous/next post navigation.
</ins><span class="cx"> twentyfourteen_post_nav();
</span><span class="cx">
</span><span class="cx"> // If comments are open or we have at least one comment, load up the comment template.
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteentagphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/tag.php (26555 => 26556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/tag.php 2013-12-03 17:01:00 UTC (rev 26555)
+++ trunk/src/wp-content/themes/twentyfourteen/tag.php 2013-12-03 17:05:53 UTC (rev 26556)
</span><span class="lines">@@ -31,14 +31,22 @@
</span><span class="cx"> </header><!-- .archive-header -->
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- while ( have_posts() ) :
- the_post();
</del><ins>+ // Start the Loop.
+ while ( have_posts() ) : the_post();
</ins><span class="cx">
</span><ins>+ /*
+ * Include the post format-specific template for the content. If you want to
+ * use this in a child theme, then include a file called called content-___.php
+ * (where ___ is the post format) and that will be used instead.
+ */
</ins><span class="cx"> get_template_part( 'content', get_post_format() );
</span><ins>+
</ins><span class="cx"> endwhile;
</span><ins>+ // Previous/next page navigation.
</ins><span class="cx"> twentyfourteen_paging_nav();
</span><span class="cx">
</span><span class="cx"> else :
</span><ins>+ // If no content, include the "No posts found" template.
</ins><span class="cx"> get_template_part( 'content', 'none' );
</span><span class="cx">
</span><span class="cx"> endif;
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteentaxonomypost_formatphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/taxonomy-post_format.php (26555 => 26556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/taxonomy-post_format.php 2013-12-03 17:01:00 UTC (rev 26555)
+++ trunk/src/wp-content/themes/twentyfourteen/taxonomy-post_format.php 2013-12-03 17:05:53 UTC (rev 26556)
</span><span class="lines">@@ -53,14 +53,22 @@
</span><span class="cx"> </header><!-- .archive-header -->
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- while ( have_posts() ) :
- the_post();
</del><ins>+ // Start the Loop.
+ while ( have_posts() ) : the_post();
</ins><span class="cx">
</span><ins>+ /*
+ * Include the post format-specific template for the content. If you want to
+ * use this in a child theme, then include a file called called content-___.php
+ * (where ___ is the post format) and that will be used instead.
+ */
</ins><span class="cx"> get_template_part( 'content', get_post_format() );
</span><ins>+
</ins><span class="cx"> endwhile;
</span><ins>+ // Previous/next page navigation.
</ins><span class="cx"> twentyfourteen_paging_nav();
</span><span class="cx">
</span><span class="cx"> else :
</span><ins>+ // If no content, include the "No posts found" template.
</ins><span class="cx"> get_template_part( 'content', 'none' );
</span><span class="cx">
</span><span class="cx"> endif;
</span></span></pre>
</div>
</div>
</body>
</html>