<!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>[25625] trunk/src/wp-content/themes/twentyeleven: Twenty Eleven: update code comments to reflect WP 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/25625">25625</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-09-25 16:49:36 +0000 (Wed, 25 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Eleven: update code comments to reflect WP inline docs standards. Props DrewAPicture, see <a href="http://core.trac.wordpress.org/ticket/25256">#25256</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyeleven404php">trunk/src/wp-content/themes/twentyeleven/404.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenarchivephp">trunk/src/wp-content/themes/twentyeleven/archive.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenauthorphp">trunk/src/wp-content/themes/twentyeleven/author.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevencategoryphp">trunk/src/wp-content/themes/twentyeleven/category.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevencommentsphp">trunk/src/wp-content/themes/twentyeleven/comments.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevencontentasidephp">trunk/src/wp-content/themes/twentyeleven/content-aside.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevencontentfeaturedphp">trunk/src/wp-content/themes/twentyeleven/content-featured.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevencontentgalleryphp">trunk/src/wp-content/themes/twentyeleven/content-gallery.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevencontentimagephp">trunk/src/wp-content/themes/twentyeleven/content-image.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevencontentintrophp">trunk/src/wp-content/themes/twentyeleven/content-intro.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevencontentlinkphp">trunk/src/wp-content/themes/twentyeleven/content-link.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevencontentpagephp">trunk/src/wp-content/themes/twentyeleven/content-page.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevencontentquotephp">trunk/src/wp-content/themes/twentyeleven/content-quote.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevencontentsinglephp">trunk/src/wp-content/themes/twentyeleven/content-single.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevencontentstatusphp">trunk/src/wp-content/themes/twentyeleven/content-status.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevencontentphp">trunk/src/wp-content/themes/twentyeleven/content.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenfooterphp">trunk/src/wp-content/themes/twentyeleven/footer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenfunctionsphp">trunk/src/wp-content/themes/twentyeleven/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenheaderphp">trunk/src/wp-content/themes/twentyeleven/header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenimagephp">trunk/src/wp-content/themes/twentyeleven/image.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenincthemeoptionsphp">trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenincwidgetsphp">trunk/src/wp-content/themes/twentyeleven/inc/widgets.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenindexphp">trunk/src/wp-content/themes/twentyeleven/index.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenpagephp">trunk/src/wp-content/themes/twentyeleven/page.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevensearchphp">trunk/src/wp-content/themes/twentyeleven/search.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevensearchformphp">trunk/src/wp-content/themes/twentyeleven/searchform.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenshowcasephp">trunk/src/wp-content/themes/twentyeleven/showcase.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevensidebarfooterphp">trunk/src/wp-content/themes/twentyeleven/sidebar-footer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevensidebarpagephp">trunk/src/wp-content/themes/twentyeleven/sidebar-page.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevensidebarphp">trunk/src/wp-content/themes/twentyeleven/sidebar.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevensinglephp">trunk/src/wp-content/themes/twentyeleven/single.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyeleventagphp">trunk/src/wp-content/themes/twentyeleven/tag.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyeleven404php"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/404.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/404.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/404.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying 404 pages (Not Found).
</del><ins>+ * Template for displaying 404 pages (Not Found)
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenarchivephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/archive.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/archive.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/archive.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,11 +1,11 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying Archive pages.
</del><ins>+ * Template for displaying Archive pages
</ins><span class="cx"> *
</span><span class="cx"> * Used to display archive-type pages if nothing more specific matches a query.
</span><span class="cx"> * For example, puts together date-based pages if no date.php file exists.
</span><span class="cx"> *
</span><del>- * Learn more: http://codex.wordpress.org/Template_Hierarchy
</del><ins>+ * @link http://codex.wordpress.org/Template_Hierarchy
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenauthorphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/author.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/author.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/author.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying Author Archive pages.
</del><ins>+ * Template for displaying Author Archive pages
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span><span class="lines">@@ -15,11 +15,12 @@
</span><span class="cx"> <?php if ( have_posts() ) : ?>
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- /* Queue the first post, that way we know
- * what author we're dealing with (if that is the case).
</del><ins>+ /**
+ * Queue the first post, that way we know what author
+ * we're dealing with (if that is the case).
</ins><span class="cx"> *
</span><del>- * We reset this later so we can run the loop
- * properly with a call to rewind_posts().
</del><ins>+ * We reset this later so we can run the loop properly
+ * with a call to rewind_posts().
</ins><span class="cx"> */
</span><span class="cx"> the_post();
</span><span class="cx"> ?>
</span><span class="lines">@@ -29,7 +30,8 @@
</span><span class="cx"> </header>
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- /* Since we called the_post() above, we need to
</del><ins>+ /**
+ * Since we called the_post() above, we need to
</ins><span class="cx"> * rewind the loop back to the beginning that way
</span><span class="cx"> * we can run the loop properly, in full.
</span><span class="cx"> */
</span><span class="lines">@@ -43,7 +45,16 @@
</span><span class="cx"> if ( get_the_author_meta( 'description' ) ) : ?>
</span><span class="cx"> <div id="author-info">
</span><span class="cx"> <div id="author-avatar">
</span><del>- <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyeleven_author_bio_avatar_size', 60 ) ); ?>
</del><ins>+ <?php
+ /**
+ * Filter the Twenty Eleven author bio avatar size.
+ *
+ * @since Twenty Eleven 1.0
+ *
+ * @param int The height and width avatar dimension in pixels. Default 60.
+ */
+ echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyeleven_author_bio_avatar_size', 60 ) );
+ ?>
</ins><span class="cx"> </div><!-- #author-avatar -->
</span><span class="cx"> <div id="author-description">
</span><span class="cx"> <h2><?php printf( __( 'About %s', 'twentyeleven' ), get_the_author() ); ?></h2>
</span><span class="lines">@@ -56,7 +67,8 @@
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- /* Include the Post-Format-specific template for the content.
</del><ins>+ /**
+ * Include the Post-Format-specific template for the content.
</ins><span class="cx"> * If you want to overload this in a child theme then include a file
</span><span class="cx"> * called content-___.php (where ___ is the Post Format name) and that will be used instead.
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevencategoryphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/category.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/category.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/category.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying Category Archive pages.
</del><ins>+ * Template for displaying Category Archive pages
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span><span class="lines">@@ -21,8 +21,16 @@
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> $category_description = category_description();
</span><del>- if ( ! empty( $category_description ) )
</del><ins>+ if ( ! empty( $category_description ) ) {
+ /**
+ * Filter the default Twenty Eleven category description.
+ *
+ * @since Twenty Eleven 1.0
+ *
+ * @param string The default category description HTML.
+ */
</ins><span class="cx"> echo apply_filters( 'category_archive_meta', '<div class="category-archive-meta">' . $category_description . '</div>' );
</span><ins>+ }
</ins><span class="cx"> ?>
</span><span class="cx"> </header>
</span><span class="cx">
</span><span class="lines">@@ -32,7 +40,8 @@
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- /* Include the Post-Format-specific template for the content.
</del><ins>+ /**
+ * Include the Post-Format-specific template for the content.
</ins><span class="cx"> * If you want to overload this in a child theme then include a file
</span><span class="cx"> * called content-___.php (where ___ is the Post Format name) and that will be used instead.
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevencommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/comments.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/comments.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/comments.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying Comments.
</del><ins>+ * Template for displaying Comments
</ins><span class="cx"> *
</span><span class="cx"> * The area of the page that contains both current comments
</span><span class="cx"> * and the comment form. The actual display of comments is
</span><span class="lines">@@ -17,7 +17,8 @@
</span><span class="cx"> <p class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'twentyeleven' ); ?></p>
</span><span class="cx"> </div><!-- #comments -->
</span><span class="cx"> <?php
</span><del>- /* Stop the rest of comments.php from being processed,
</del><ins>+ /**
+ * Stop the rest of comments.php from being processed,
</ins><span class="cx"> * but don't kill the script entirely -- we still have
</span><span class="cx"> * to fully load the template.
</span><span class="cx"> */
</span><span class="lines">@@ -45,7 +46,8 @@
</span><span class="cx">
</span><span class="cx"> <ol class="commentlist">
</span><span class="cx"> <?php
</span><del>- /* Loop through and list the comments. Tell wp_list_comments()
</del><ins>+ /**
+ * Loop through and list the comments. Tell wp_list_comments()
</ins><span class="cx"> * to use twentyeleven_comment() to format the comments.
</span><span class="cx"> * If you want to overload this in a child theme then you can
</span><span class="cx"> * define twentyeleven_comment() and that will be used instead.
</span><span class="lines">@@ -64,7 +66,8 @@
</span><span class="cx"> <?php endif; // check for comment navigation ?>
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- /* If there are no comments and comments are closed, let's leave a little note, shall we?
</del><ins>+ /**
+ * If there are no comments and comments are closed, let's leave a little note, shall we?
</ins><span class="cx"> * But we only want the note on posts and pages that had comments in the first place.
</span><span class="cx"> */
</span><span class="cx"> if ( ! comments_open() && get_comments_number() ) : ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevencontentasidephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/content-aside.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/content-aside.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/content-aside.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,9 +1,11 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying posts in the Aside Post Format on index and archive pages
</del><ins>+ * Template for displaying posts in the Aside Post Format
</ins><span class="cx"> *
</span><del>- * Learn more: http://codex.wordpress.org/Post_Formats
</del><ins>+ * Used on index and archive pages.
</ins><span class="cx"> *
</span><ins>+ * @link http://codex.wordpress.org/Post_Formats
+ *
</ins><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span><span class="cx"> * @since Twenty Eleven 1.0
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevencontentfeaturedphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/content-featured.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/content-featured.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/content-featured.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying content featured in the showcase.php page template
</del><ins>+ * Template for displaying content featured in the showcase.php page template
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevencontentgalleryphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/content-gallery.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/content-gallery.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/content-gallery.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,9 +1,11 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying posts in the Gallery Post Format on index and archive pages
</del><ins>+ * Template for displaying posts in the Gallery Post Format
</ins><span class="cx"> *
</span><del>- * Learn more: http://codex.wordpress.org/Post_Formats
</del><ins>+ * Used on index and archive pages.
</ins><span class="cx"> *
</span><ins>+ * @link http://codex.wordpress.org/Post_Formats
+ *
</ins><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span><span class="cx"> * @since Twenty Eleven 1.0
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevencontentimagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/content-image.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/content-image.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/content-image.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,9 +1,11 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying posts in the Image Post Format on index and archive pages
</del><ins>+ * Template for displaying posts in the Image Post Format
</ins><span class="cx"> *
</span><del>- * Learn more: http://codex.wordpress.org/Post_Formats
</del><ins>+ * Used on index and archive pages.
</ins><span class="cx"> *
</span><ins>+ * @link http://codex.wordpress.org/Post_Formats
+ *
</ins><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span><span class="cx"> * @since Twenty Eleven 1.0
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevencontentintrophp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/content-intro.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/content-intro.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/content-intro.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying page content in the showcase.php page template
</del><ins>+ * Template for displaying page content in the showcase.php page template
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevencontentlinkphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/content-link.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/content-link.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/content-link.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,9 +1,11 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying posts in the Link Post Format on index and archive pages
</del><ins>+ * Template for displaying posts in the Link Post Format
</ins><span class="cx"> *
</span><del>- * Learn more: http://codex.wordpress.org/Post_Formats
</del><ins>+ * Used on index and archive pages
</ins><span class="cx"> *
</span><ins>+ * @link http://codex.wordpress.org/Post_Formats
+ *
</ins><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span><span class="cx"> * @since Twenty Eleven 1.0
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevencontentpagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/content-page.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/content-page.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/content-page.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template used for displaying page content in page.php
</del><ins>+ * Template used for displaying page content in page.php
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevencontentquotephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/content-quote.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/content-quote.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/content-quote.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The default template for displaying content
</del><ins>+ * Template for displaying content
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevencontentsinglephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/content-single.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/content-single.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/content-single.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -54,7 +54,10 @@
</span><span class="cx"> <?php if ( get_the_author_meta( 'description' ) && ( ! function_exists( 'is_multi_author' ) || is_multi_author() ) ) : // If a user has filled out their description and this is a multi-author blog, show a bio on their entries ?>
</span><span class="cx"> <div id="author-info">
</span><span class="cx"> <div id="author-avatar">
</span><del>- <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyeleven_author_bio_avatar_size', 68 ) ); ?>
</del><ins>+ <?php
+ //duplicate_hook
+ echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyeleven_author_bio_avatar_size', 68 ) );
+ ?>
</ins><span class="cx"> </div><!-- #author-avatar -->
</span><span class="cx"> <div id="author-description">
</span><span class="cx"> <h2><?php printf( __( 'About %s', 'twentyeleven' ), get_the_author() ); ?></h2>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevencontentstatusphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/content-status.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/content-status.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/content-status.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,11 +1,14 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying posts in the Status Post Format on index and archive pages
</del><ins>+ * Template for displaying posts in the Status Post Format
</ins><span class="cx"> *
</span><del>- * Learn more: http://codex.wordpress.org/Post_Formats
</del><ins>+ * Used on index and archive pages
</ins><span class="cx"> *
</span><ins>+ * @link http://codex.wordpress.org/Post_Formats
+ *
</ins><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span><ins>+ * @since Twenty Eleven 1.0
</ins><span class="cx"> */
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="lines">@@ -29,7 +32,18 @@
</span><span class="cx"> </div><!-- .entry-summary -->
</span><span class="cx"> <?php else : ?>
</span><span class="cx"> <div class="entry-content">
</span><del>- <div class="avatar"><?php echo get_avatar( get_the_author_meta( 'ID' ), apply_filters( 'twentyeleven_status_avatar', '65' ) ); ?></div>
</del><ins>+ <div class="avatar">
+ <?php
+ /**
+ * Filter the Twenty Eleven status avatar size.
+ *
+ * @since Twenty Eleven 1.0
+ *
+ * @param int The height and width avatar dimensions in pixels. Default 65.
+ */
+ echo get_avatar( get_the_author_meta( 'ID' ), apply_filters( 'twentyeleven_status_avatar', 65 ) );
+ ?>
+ </div>
</ins><span class="cx">
</span><span class="cx"> <?php the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyeleven' ) ); ?>
</span><span class="cx"> <?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevencontentphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/content.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/content.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/content.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The default template for displaying content
</del><ins>+ * Template for displaying content
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/footer.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/footer.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/footer.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying the footer.
</del><ins>+ * Template for displaying the footer
</ins><span class="cx"> *
</span><span class="cx"> * Contains the closing of the id=main div and all content after
</span><span class="cx"> *
</span><span class="lines">@@ -15,7 +15,8 @@
</span><span class="cx"> <footer id="colophon" role="contentinfo">
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- /* A sidebar in the footer? Yep. You can can customize
</del><ins>+ /**
+ * A sidebar in the footer? Yep. You can can customize
</ins><span class="cx"> * your footer with three columns of widgets.
</span><span class="cx"> */
</span><span class="cx"> if ( ! is_404() )
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/functions.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/functions.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/functions.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> if ( ! function_exists( 'twentyeleven_setup' ) ):
</span><span class="cx"> /**
</span><del>- * Sets up theme defaults and registers support for various WordPress features.
</del><ins>+ * Set up theme defaults and registers support for various WordPress features.
</ins><span class="cx"> *
</span><span class="cx"> * Note that this function is hooked into the after_setup_theme hook, which runs
</span><span class="cx"> * before the init hook. The init hook is too late for some features, such as indicating
</span><span class="lines">@@ -60,22 +60,24 @@
</span><span class="cx"> * To override twentyeleven_setup() in a child theme, add your own twentyeleven_setup to your child theme's
</span><span class="cx"> * functions.php file.
</span><span class="cx"> *
</span><del>- * @uses load_theme_textdomain() For translation/localization support.
- * @uses add_editor_style() To style the visual editor.
- * @uses add_theme_support() To add support for post thumbnails, automatic feed links, custom headers
- * and backgrounds, and post formats.
- * @uses register_nav_menus() To add support for navigation menus.
</del><ins>+ * @uses load_theme_textdomain() For translation/localization support.
+ * @uses add_editor_style() To style the visual editor.
+ * @uses add_theme_support() To add support for post thumbnails, automatic feed links, custom headers
+ * and backgrounds, and post formats.
+ * @uses register_nav_menus() To add support for navigation menus.
</ins><span class="cx"> * @uses register_default_headers() To register the default custom header images provided with the theme.
</span><del>- * @uses set_post_thumbnail_size() To set a custom post thumbnail size.
</del><ins>+ * @uses set_post_thumbnail_size() To set a custom post thumbnail size.
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.0
</span><span class="cx"> */
</span><span class="cx"> function twentyeleven_setup() {
</span><span class="cx">
</span><del>- /* Make Twenty Eleven available for translation.
</del><ins>+ /**
+ * Make Twenty Eleven available for translation.
</ins><span class="cx"> * Translations can be added to the /languages/ directory.
</span><del>- * If you're building a theme based on Twenty Eleven, use a find and replace
- * to change 'twentyeleven' to the name of your theme in all the template files.
</del><ins>+ * If you're building a theme based on Twenty Eleven, use
+ * a find and replace to change 'twentyeleven' to the name
+ * of your theme in all the template files.
</ins><span class="cx"> */
</span><span class="cx"> load_theme_textdomain( 'twentyeleven', get_template_directory() . '/languages' );
</span><span class="cx">
</span><span class="lines">@@ -105,8 +107,10 @@
</span><span class="cx">
</span><span class="cx"> // Add support for custom backgrounds.
</span><span class="cx"> add_theme_support( 'custom-background', array(
</span><del>- // Let WordPress know what our default background color is.
- // This is dependent on our current color scheme.
</del><ins>+ /**
+ * Let WordPress know what our default background color is.
+ * This is dependent on our current color scheme.
+ */
</ins><span class="cx"> 'default-color' => $default_background_color,
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="lines">@@ -118,7 +122,21 @@
</span><span class="cx"> // The default header text color.
</span><span class="cx"> 'default-text-color' => '000',
</span><span class="cx"> // The height and width of our custom header.
</span><ins>+ /**
+ * Filter the Twenty Eleven default header image width.
+ *
+ * @since Twenty Eleven 1.0
+ *
+ * @param int The default header image width in pixels. Default 1000.
+ */
</ins><span class="cx"> 'width' => apply_filters( 'twentyeleven_header_image_width', 1000 ),
</span><ins>+ /**
+ * Filter the Twenty Eleven default header image height.
+ *
+ * @since Twenty Eleven 1.0
+ *
+ * @param int The default header image height in pixels. Default 288.
+ */
</ins><span class="cx"> 'height' => apply_filters( 'twentyeleven_header_image_height', 288 ),
</span><span class="cx"> // Support flexible heights.
</span><span class="cx"> 'flex-height' => true,
</span><span class="lines">@@ -144,13 +162,17 @@
</span><span class="cx"> add_custom_background();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // We'll be using post thumbnails for custom header images on posts and pages.
- // We want them to be the size of the header image that we just defined
- // Larger images will be auto-cropped to fit, smaller ones will be ignored. See header.php.
</del><ins>+ /**
+ * We'll be using post thumbnails for custom header images on posts and pages.
+ * We want them to be the size of the header image that we just defined.
+ * Larger images will be auto-cropped to fit, smaller ones will be ignored. See header.php.
+ */
</ins><span class="cx"> set_post_thumbnail_size( $custom_header_support['width'], $custom_header_support['height'], true );
</span><span class="cx">
</span><del>- // Add Twenty Eleven's custom image sizes.
- // Used for large feature (header) images.
</del><ins>+ /**
+ * Add Twenty Eleven's custom image sizes.
+ * Used for large feature (header) images.
+ */
</ins><span class="cx"> add_image_size( 'large-feature', $custom_header_support['width'], $custom_header_support['height'], true );
</span><span class="cx"> // Used for featured posts if a large-feature doesn't exist.
</span><span class="cx"> add_image_size( 'small-feature', 500, 300 );
</span><span class="lines">@@ -211,7 +233,7 @@
</span><span class="cx">
</span><span class="cx"> if ( ! function_exists( 'twentyeleven_header_style' ) ) :
</span><span class="cx"> /**
</span><del>- * Styles the header image and text displayed on the blog
</del><ins>+ * Styles the header image and text displayed on the blog.
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.0
</span><span class="cx"> */
</span><span class="lines">@@ -327,10 +349,16 @@
</span><span class="cx"> endif; // twentyeleven_admin_header_image
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Sets the post excerpt length to 40 words.
</del><ins>+ * Set the post excerpt length to 40 words.
</ins><span class="cx"> *
</span><del>- * To override this length in a child theme, remove the filter and add your own
- * function tied to the excerpt_length filter hook.
</del><ins>+ * To override this length in a child theme, remove
+ * the filter and add your own function tied to
+ * the excerpt_length filter hook.
+ *
+ * @since Twenty Eleven 1.0
+ *
+ * @param int $length The number of excerpt characters.
+ * @return int The filtered number of characters.
</ins><span class="cx"> */
</span><span class="cx"> function twentyeleven_excerpt_length( $length ) {
</span><span class="cx"> return 40;
</span><span class="lines">@@ -339,7 +367,11 @@
</span><span class="cx">
</span><span class="cx"> if ( ! function_exists( 'twentyeleven_continue_reading_link' ) ) :
</span><span class="cx"> /**
</span><del>- * Returns a "Continue Reading" link for excerpts
</del><ins>+ * Return a "Continue Reading" link for excerpts
+ *
+ * @since Twenty Eleven 1.0
+ *
+ * @return string The "Continue Reading" HTML link.
</ins><span class="cx"> */
</span><span class="cx"> function twentyeleven_continue_reading_link() {
</span><span class="cx"> return ' <a href="'. esc_url( get_permalink() ) . '">' . __( 'Continue reading <span class="meta-nav">→</span>', 'twentyeleven' ) . '</a>';
</span><span class="lines">@@ -347,10 +379,17 @@
</span><span class="cx"> endif; // twentyeleven_continue_reading_link
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Replaces "[...]" (appended to automatically generated excerpts) with an ellipsis and twentyeleven_continue_reading_link().
</del><ins>+ * Replace "[...]" in the Read More link with an ellipsis.
</ins><span class="cx"> *
</span><ins>+ * The "[...]" is appended to automatically generated excerpts.
+ *
</ins><span class="cx"> * To override this in a child theme, remove the filter and add your own
</span><span class="cx"> * function tied to the excerpt_more filter hook.
</span><ins>+ *
+ * @since Twenty Eleven 1.0
+ *
+ * @param string $more The Read More text.
+ * @return The filtered Read More text.
</ins><span class="cx"> */
</span><span class="cx"> function twentyeleven_auto_excerpt_more( $more ) {
</span><span class="cx"> return ' …' . twentyeleven_continue_reading_link();
</span><span class="lines">@@ -358,10 +397,15 @@
</span><span class="cx"> add_filter( 'excerpt_more', 'twentyeleven_auto_excerpt_more' );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Adds a pretty "Continue Reading" link to custom post excerpts.
</del><ins>+ * Add a pretty "Continue Reading" link to custom post excerpts.
</ins><span class="cx"> *
</span><span class="cx"> * To override this link in a child theme, remove the filter and add your own
</span><span class="cx"> * function tied to the get_the_excerpt filter hook.
</span><ins>+ *
+ * @since Twenty Eleven 1.0
+ *
+ * @param string $output The "Continue Reading" link.
+ * @return string The filtered "Continue Reading" link.
</ins><span class="cx"> */
</span><span class="cx"> function twentyeleven_custom_excerpt_more( $output ) {
</span><span class="cx"> if ( has_excerpt() && ! is_attachment() ) {
</span><span class="lines">@@ -372,7 +416,12 @@
</span><span class="cx"> add_filter( 'get_the_excerpt', 'twentyeleven_custom_excerpt_more' );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Get our wp_nav_menu() fallback, wp_page_menu(), to show a home link.
</del><ins>+ * Show a home link for the wp_nav_menu() fallback, wp_page_menu().
+ *
+ * @since Twenty Eleven 1.0
+ *
+ * @param array $args The page menu arguments. @see wp_page_menu()
+ * @return array The filtered page menu arguments.
</ins><span class="cx"> */
</span><span class="cx"> function twentyeleven_page_menu_args( $args ) {
</span><span class="cx"> if ( ! isset( $args['show_home'] ) )
</span><span class="lines">@@ -382,8 +431,10 @@
</span><span class="cx"> add_filter( 'wp_page_menu_args', 'twentyeleven_page_menu_args' );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Register our sidebars and widgetized areas. Also register the default Epherma widget.
</del><ins>+ * Register sidebars and widgetized areas.
</ins><span class="cx"> *
</span><ins>+ * Also register the default Epherma widget.
+ *
</ins><span class="cx"> * @since Twenty Eleven 1.0
</span><span class="cx"> */
</span><span class="cx"> function twentyeleven_widgets_init() {
</span><span class="lines">@@ -443,7 +494,11 @@
</span><span class="cx">
</span><span class="cx"> if ( ! function_exists( 'twentyeleven_content_nav' ) ) :
</span><span class="cx"> /**
</span><del>- * Display navigation to next/previous pages when applicable
</del><ins>+ * Display navigation to next/previous pages when applicable.
+ *
+ * @since Twenty Eleven 1.0
+ *
+ * @param string $html_id The HTML id attribute.
</ins><span class="cx"> */
</span><span class="cx"> function twentyeleven_content_nav( $html_id ) {
</span><span class="cx"> global $wp_query;
</span><span class="lines">@@ -462,9 +517,11 @@
</span><span class="cx"> * Return the first link from the post content. If none found, the
</span><span class="cx"> * post permalink is used as a fallback.
</span><span class="cx"> *
</span><ins>+ * @since Twenty Eleven 1.0
+ *
</ins><span class="cx"> * @uses get_url_in_content() to get the first URL from the post content.
</span><span class="cx"> *
</span><del>- * @return string
</del><ins>+ * @return string The first link.
</ins><span class="cx"> */
</span><span class="cx"> function twentyeleven_get_first_url() {
</span><span class="cx"> $content = get_the_content();
</span><span class="lines">@@ -473,6 +530,7 @@
</span><span class="cx"> if ( ! $has_url )
</span><span class="cx"> $has_url = twentyeleven_url_grabber();
</span><span class="cx">
</span><ins>+ //duplicate_hook
</ins><span class="cx"> return ( $has_url ) ? $has_url : apply_filters( 'the_permalink', get_permalink() );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -480,6 +538,7 @@
</span><span class="cx"> * Return the URL for the first link found in the post content.
</span><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.0
</span><ins>+ *
</ins><span class="cx"> * @return string|bool URL or false when no link is present.
</span><span class="cx"> */
</span><span class="cx"> function twentyeleven_url_grabber() {
</span><span class="lines">@@ -490,7 +549,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Count the number of footer sidebars to enable dynamic classes for the footer
</del><ins>+ * Count the number of footer sidebars to enable dynamic classes for the footer.
+ *
+ * @since Twenty Eleven 1.0
</ins><span class="cx"> */
</span><span class="cx"> function twentyeleven_footer_sidebar_class() {
</span><span class="cx"> $count = 0;
</span><span class="lines">@@ -532,6 +593,10 @@
</span><span class="cx"> * Used as a callback by wp_list_comments() for displaying the comments.
</span><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.0
</span><ins>+ *
+ * @param object $comment The comment object.
+ * @param array $args An array of comment arguments. @see get_comment_reply_link()
+ * @param int $depth The depth of the comment.
</ins><span class="cx"> */
</span><span class="cx"> function twentyeleven_comment( $comment, $args, $depth ) {
</span><span class="cx"> $GLOBALS['comment'] = $comment;
</span><span class="lines">@@ -593,7 +658,8 @@
</span><span class="cx">
</span><span class="cx"> if ( ! function_exists( 'twentyeleven_posted_on' ) ) :
</span><span class="cx"> /**
</span><del>- * Prints HTML with meta information for the current post-date/time and author.
</del><ins>+ * Print HTML with meta information for the current post-date/time and author.
+ *
</ins><span class="cx"> * Create your own twentyeleven_posted_on to override in a child theme
</span><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.0
</span><span class="lines">@@ -612,11 +678,15 @@
</span><span class="cx"> endif;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Adds two classes to the array of body classes.
</del><ins>+ * Add two classes to the array of body classes.
+ *
</ins><span class="cx"> * The first is if the site has only had one author with published posts.
</span><span class="cx"> * The second is if a singular post being displayed
</span><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.0
</span><ins>+ *
+ * @param array $classes Existing body classes.
+ * @return array The filtered array of body classes.
</ins><span class="cx"> */
</span><span class="cx"> function twentyeleven_body_classes( $classes ) {
</span><span class="cx">
</span><span class="lines">@@ -631,10 +701,10 @@
</span><span class="cx"> add_filter( 'body_class', 'twentyeleven_body_classes' );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Retrieves the IDs for images in a gallery.
</del><ins>+ * Retrieve the IDs for images in a gallery.
</ins><span class="cx"> *
</span><del>- * @uses get_post_galleries() first, if available. Falls back to shortcode parsing,
- * then as last option uses a get_posts() call.
</del><ins>+ * @uses get_post_galleries() First, if available. Falls back to shortcode parsing,
+ * then as last option uses a get_posts() call.
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.6.
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/header.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/header.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/header.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The Header for our theme.
</del><ins>+ * Header template for the theme
</ins><span class="cx"> *
</span><del>- * Displays all of the <head> section and everything up till <div id="main">
</del><ins>+ * Displays all of the <head> section and everything up till <div id="main">.
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> <meta charset="<?php bloginfo( 'charset' ); ?>" />
</span><span class="cx"> <meta name="viewport" content="width=device-width" />
</span><span class="cx"> <title><?php
</span><del>- /*
</del><ins>+ /**
</ins><span class="cx"> * Print the <title> tag based on what is being viewed.
</span><span class="cx"> */
</span><span class="cx"> global $page, $paged;
</span><span class="lines">@@ -52,13 +52,15 @@
</span><span class="cx"> <script src="<?php echo get_template_directory_uri(); ?>/js/html5.js" type="text/javascript"></script>
</span><span class="cx"> <![endif]-->
</span><span class="cx"> <?php
</span><del>- /* We add some JavaScript to pages with the comment form
</del><ins>+ /**
+ * We add some JavaScript to pages with the comment form
</ins><span class="cx"> * to support sites with threaded comments (when in use).
</span><span class="cx"> */
</span><span class="cx"> if ( is_singular() && get_option( 'thread_comments' ) )
</span><span class="cx"> wp_enqueue_script( 'comment-reply' );
</span><span class="cx">
</span><del>- /* Always have wp_head() just before the closing </head>
</del><ins>+ /**
+ * Always have wp_head() just before the closing </head>
</ins><span class="cx"> * tag of your theme, or you will break many plugins, which
</span><span class="cx"> * generally use this hook to add elements to <head> such
</span><span class="cx"> * as styles, scripts, and meta tags.
</span><span class="lines">@@ -81,8 +83,10 @@
</span><span class="cx"> if ( $header_image ) :
</span><span class="cx"> // Compatibility with versions of WordPress prior to 3.4.
</span><span class="cx"> if ( function_exists( 'get_custom_header' ) ) {
</span><del>- // We need to figure out what the minimum width should be for our featured image.
- // This result would be the suggested width if the theme were to implement flexible widths.
</del><ins>+ /**
+ * We need to figure out what the minimum width should be for our featured image.
+ * This result would be the suggested width if the theme were to implement flexible widths.
+ */
</ins><span class="cx"> $header_image_width = get_theme_support( 'custom-header', 'width' );
</span><span class="cx"> } else {
</span><span class="cx"> $header_image_width = HEADER_IMAGE_WIDTH;
</span><span class="lines">@@ -90,8 +94,10 @@
</span><span class="cx"> ?>
</span><span class="cx"> <a href="<?php echo esc_url( home_url( '/' ) ); ?>">
</span><span class="cx"> <?php
</span><del>- // The header image
- // Check if this is a post or page, if it has a thumbnail, and if it's a big one
</del><ins>+ /**
+ * The header image.
+ * Check if this is a post or page, if it has a thumbnail, and if it's a big one
+ */
</ins><span class="cx"> if ( is_singular() && has_post_thumbnail( $post->ID ) &&
</span><span class="cx"> ( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), array( $header_image_width, $header_image_width ) ) ) &&
</span><span class="cx"> $image[1] >= $header_image_width ) :
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenimagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/image.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/image.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/image.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying image attachments.
</del><ins>+ * Template for displaying image attachments
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span><span class="lines">@@ -72,6 +72,13 @@
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> <a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php
</span><ins>+ /**
+ * Filter the Twenty Eleven default attachment size.
+ *
+ * @since Twenty Eleven 1.0
+ *
+ * @param int The height and width attachment size dimensions in pixels. Default 848.
+ */
</ins><span class="cx"> $attachment_size = apply_filters( 'twentyeleven_attachment_size', 848 );
</span><span class="cx"> echo wp_get_attachment_image( $post->ID, array( $attachment_size, 1024 ) ); // filterable image width with 1024px limit for image height.
</span><span class="cx"> ?></a>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenincthemeoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -14,6 +14,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.0
</span><span class="cx"> *
</span><ins>+ * @param string $hook_suffix An admin page's hook suffix.
</ins><span class="cx"> */
</span><span class="cx"> function twentyeleven_admin_enqueue_scripts( $hook_suffix ) {
</span><span class="cx"> wp_enqueue_style( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options.css', false, '2011-04-28' );
</span><span class="lines">@@ -51,11 +52,11 @@
</span><span class="cx">
</span><span class="cx"> // Register our individual settings fields
</span><span class="cx"> add_settings_field(
</span><del>- 'color_scheme', // Unique identifier for the field for this section
- __( 'Color Scheme', 'twentyeleven' ), // Setting field label
</del><ins>+ 'color_scheme', // Unique identifier for the field for this section
+ __( 'Color Scheme', 'twentyeleven' ), // Setting field label
</ins><span class="cx"> 'twentyeleven_settings_field_color_scheme', // Function that renders the settings field
</span><del>- 'theme_options', // Menu slug, used to uniquely identify the page; see twentyeleven_theme_options_add_page()
- 'general' // Settings section. Same as the first argument in the add_settings_section() above
</del><ins>+ 'theme_options', // Menu slug, used to uniquely identify the page; see twentyeleven_theme_options_add_page()
+ 'general' // Settings section. Same as the first argument in the add_settings_section() above
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> add_settings_field( 'link_color', __( 'Link Color', 'twentyeleven' ), 'twentyeleven_settings_field_link_color', 'theme_options', 'general' );
</span><span class="lines">@@ -66,7 +67,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Change the capability required to save the 'twentyeleven_options' options group.
</span><span class="cx"> *
</span><del>- * @see twentyeleven_theme_options_init() First parameter to register_setting() is the name of the options group.
</del><ins>+ * @see twentyeleven_theme_options_init() First parameter to register_setting() is the name of the options group.
</ins><span class="cx"> * @see twentyeleven_theme_options_add_page() The edit_theme_options capability is used for viewing the page.
</span><span class="cx"> *
</span><span class="cx"> * By default, the options groups for all registered settings require the manage_options capability.
</span><span class="lines">@@ -83,7 +84,7 @@
</span><span class="cx"> add_filter( 'option_page_capability_twentyeleven_options', 'twentyeleven_option_page_capability' );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Add our theme options page to the admin menu, including some help documentation.
</del><ins>+ * Add a theme options page to the admin menu, including some help documentation.
</ins><span class="cx"> *
</span><span class="cx"> * This function is attached to the admin_menu action hook.
</span><span class="cx"> *
</span><span class="lines">@@ -122,7 +123,7 @@
</span><span class="cx"> $screen = get_current_screen();
</span><span class="cx">
</span><span class="cx"> if ( method_exists( $screen, 'add_help_tab' ) ) {
</span><del>- // WordPress 3.3
</del><ins>+ // WordPress 3.3.0
</ins><span class="cx"> $screen->add_help_tab( array(
</span><span class="cx"> 'title' => __( 'Overview', 'twentyeleven' ),
</span><span class="cx"> 'id' => 'theme-options-help',
</span><span class="lines">@@ -132,13 +133,13 @@
</span><span class="cx">
</span><span class="cx"> $screen->set_help_sidebar( $sidebar );
</span><span class="cx"> } else {
</span><del>- // WordPress 3.2
</del><ins>+ // WordPress 3.2.0
</ins><span class="cx"> add_contextual_help( $screen, $help . $sidebar );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Returns an array of color schemes registered for Twenty Eleven.
</del><ins>+ * Return an array of color schemes registered for Twenty Eleven.
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.0
</span><span class="cx"> */
</span><span class="lines">@@ -158,11 +159,18 @@
</span><span class="cx"> ),
</span><span class="cx"> );
</span><span class="cx">
</span><ins>+ /**
+ * Filter the Twenty Eleven color scheme options.
+ *
+ * @since Twenty Eleven 1.0
+ *
+ * @param array $color_scheme_options An associative array of color scheme options.
+ */
</ins><span class="cx"> return apply_filters( 'twentyeleven_color_schemes', $color_scheme_options );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Returns an array of layout options registered for Twenty Eleven.
</del><ins>+ * Return an array of layout options registered for Twenty Eleven.
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.0
</span><span class="cx"> */
</span><span class="lines">@@ -185,13 +193,22 @@
</span><span class="cx"> ),
</span><span class="cx"> );
</span><span class="cx">
</span><ins>+ /**
+ * Filter the Twenty Eleven layout options.
+ *
+ * @since Twenty Eleven 1.0
+ *
+ * @param array $layout_options An associative array of layout options.
+ */
</ins><span class="cx"> return apply_filters( 'twentyeleven_layouts', $layout_options );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Returns the default options for Twenty Eleven.
</del><ins>+ * Return the default options for Twenty Eleven.
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.0
</span><ins>+ *
+ * @return array An array of default theme options.
</ins><span class="cx"> */
</span><span class="cx"> function twentyeleven_get_default_theme_options() {
</span><span class="cx"> $default_theme_options = array(
</span><span class="lines">@@ -203,16 +220,24 @@
</span><span class="cx"> if ( is_rtl() )
</span><span class="cx"> $default_theme_options['theme_layout'] = 'sidebar-content';
</span><span class="cx">
</span><ins>+ /**
+ * Filter the Twenty Eleven default options.
+ *
+ * @since Twenty Eleven 1.0
+ *
+ * @param array $default_theme_options An array of default theme options.
+ */
</ins><span class="cx"> return apply_filters( 'twentyeleven_default_theme_options', $default_theme_options );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Returns the default link color for Twenty Eleven, based on color scheme.
</del><ins>+ * Return the default link color for Twenty Eleven, based on color scheme.
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.0
</span><span class="cx"> *
</span><del>- * @param $string $color_scheme Color scheme. Defaults to the active color scheme.
- * @return $string Color.
</del><ins>+ * @param string $color_scheme Optional. Color scheme.
+ * Default null (or the active color scheme).
+ * @return string The default link color.
</ins><span class="cx"> */
</span><span class="cx"> function twentyeleven_get_default_link_color( $color_scheme = null ) {
</span><span class="cx"> if ( null === $color_scheme ) {
</span><span class="lines">@@ -228,7 +253,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Returns the options array for Twenty Eleven.
</del><ins>+ * Return the options array for Twenty Eleven.
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.0
</span><span class="cx"> */
</span><span class="lines">@@ -237,7 +262,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Renders the Color Scheme setting field.
</del><ins>+ * Render the Color Scheme setting field.
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.3
</span><span class="cx"> */
</span><span class="lines">@@ -261,7 +286,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Renders the Link Color setting field.
</del><ins>+ * Render the Link Color setting field.
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.3
</span><span class="cx"> */
</span><span class="lines">@@ -278,7 +303,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Renders the Layout setting field.
</del><ins>+ * Render the Layout setting field.
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.3
</span><span class="cx"> */
</span><span class="lines">@@ -300,7 +325,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Returns the options array for Twenty Eleven.
</del><ins>+ * Return the options array for Twenty Eleven.
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.2
</span><span class="cx"> */
</span><span class="lines">@@ -324,12 +349,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Sanitize and validate form input. Accepts an array, return a sanitized array.
</del><ins>+ * Sanitize and validate form input.
</ins><span class="cx"> *
</span><ins>+ * Accepts an array, return a sanitized array.
+ *
</ins><span class="cx"> * @see twentyeleven_theme_options_init()
</span><span class="cx"> * @todo set up Reset Options action
</span><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.0
</span><ins>+ *
+ * @param array $input An array of form input.
</ins><span class="cx"> */
</span><span class="cx"> function twentyeleven_theme_options_validate( $input ) {
</span><span class="cx"> $output = $defaults = twentyeleven_get_default_theme_options();
</span><span class="lines">@@ -349,6 +378,15 @@
</span><span class="cx"> if ( isset( $input['theme_layout'] ) && array_key_exists( $input['theme_layout'], twentyeleven_layouts() ) )
</span><span class="cx"> $output['theme_layout'] = $input['theme_layout'];
</span><span class="cx">
</span><ins>+ /**
+ * Filter the Twenty Eleven sanitized form input array.
+ *
+ * @since Twenty Eleven 1.0
+ *
+ * @param array $output An array of sanitized form output.
+ * @param array $input An array of un-sanitized form input.
+ * @param array $defaults An array of default theme options.
+ */
</ins><span class="cx"> return apply_filters( 'twentyeleven_theme_options_validate', $output, $input, $defaults );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -364,6 +402,13 @@
</span><span class="cx"> if ( 'dark' == $color_scheme )
</span><span class="cx"> wp_enqueue_style( 'dark', get_template_directory_uri() . '/colors/dark.css', array(), null );
</span><span class="cx">
</span><ins>+ /**
+ * Fires after the styles for the Twenty Eleven color scheme are enqueued.
+ *
+ * @since Twenty Eleven 1.0
+ *
+ * @param string $color_scheme The color scheme.
+ */
</ins><span class="cx"> do_action( 'twentyeleven_enqueue_color_scheme', $color_scheme );
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wp_enqueue_scripts', 'twentyeleven_enqueue_color_scheme' );
</span><span class="lines">@@ -417,9 +462,11 @@
</span><span class="cx"> add_action( 'wp_head', 'twentyeleven_print_link_color_style' );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Adds Twenty Eleven layout classes to the array of body classes.
</del><ins>+ * Add Twenty Eleven layout classes to the array of body classes.
</ins><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.0
</span><ins>+ *
+ * @param array $existing_classes An array of existing body classes.
</ins><span class="cx"> */
</span><span class="cx"> function twentyeleven_layout_classes( $existing_classes ) {
</span><span class="cx"> $options = twentyeleven_get_theme_options();
</span><span class="lines">@@ -437,6 +484,14 @@
</span><span class="cx"> else
</span><span class="cx"> $classes[] = $current_layout;
</span><span class="cx">
</span><ins>+ /**
+ * Filter the Twenty Eleven layout body classes.
+ *
+ * @since Twenty Eleven 1.0
+ *
+ * @param array $classes An array of body classes.
+ * @param string $current_layout The current theme layout.
+ */
</ins><span class="cx"> $classes = apply_filters( 'twentyeleven_layout_classes', $classes, $current_layout );
</span><span class="cx">
</span><span class="cx"> return array_merge( $existing_classes, $classes );
</span><span class="lines">@@ -446,10 +501,11 @@
</span><span class="cx"> /**
</span><span class="cx"> * Implements Twenty Eleven theme options into Theme Customizer
</span><span class="cx"> *
</span><del>- * @param $wp_customize Theme Customizer object
</del><ins>+ * @since Twenty Eleven 1.3
+ *
+ * @param object $wp_customize Theme Customizer object.
</ins><span class="cx"> * @return void
</span><span class="cx"> *
</span><del>- * @since Twenty Eleven 1.3
</del><span class="cx"> */
</span><span class="cx"> function twentyeleven_customize_register( $wp_customize ) {
</span><span class="cx"> $wp_customize->get_setting( 'blogname' )->transport = 'postMessage';
</span><span class="lines">@@ -521,6 +577,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Bind JS handlers to make Theme Customizer preview reload changes asynchronously.
</span><ins>+ *
</ins><span class="cx"> * Used with blogname and blogdescription.
</span><span class="cx"> *
</span><span class="cx"> * @since Twenty Eleven 1.3
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenincwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/inc/widgets.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/inc/widgets.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/inc/widgets.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,9 +1,11 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * Makes a custom Widget for displaying Aside, Link, Status, and Quote Posts available with Twenty Eleven
</del><ins>+ * Widget For displaying post format posts
</ins><span class="cx"> *
</span><del>- * Learn more: http://codex.wordpress.org/Widgets_API#Developing_Widgets
</del><ins>+ * Handles displaying Aside, Link, Status, and Quote Posts available with Twenty Eleven.
</ins><span class="cx"> *
</span><ins>+ * @link http://codex.wordpress.org/Widgets_API#Developing_Widgets
+ *
</ins><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span><span class="cx"> * @since Twenty Eleven 1.0
</span><span class="lines">@@ -13,6 +15,8 @@
</span><span class="cx"> /**
</span><span class="cx"> * Constructor
</span><span class="cx"> *
</span><ins>+ * @since Twenty Eleven 1.0
+ *
</ins><span class="cx"> * @return void
</span><span class="cx"> **/
</span><span class="cx"> function Twenty_Eleven_Ephemera_Widget() {
</span><span class="lines">@@ -28,9 +32,11 @@
</span><span class="cx"> /**
</span><span class="cx"> * Outputs the HTML for this widget.
</span><span class="cx"> *
</span><del>- * @param array An array of standard parameters for widgets in this theme
- * @param array An array of settings for this widget instance
- * @return void Echoes its output
</del><ins>+ * @since Twenty Eleven 1.0
+ *
+ * @param array $args An array of standard parameters for widgets in this theme.
+ * @param array $instance An array of settings for this widget instance.
+ * @return void
</ins><span class="cx"> **/
</span><span class="cx"> function widget( $args, $instance ) {
</span><span class="cx"> $cache = wp_cache_get( 'widget_twentyeleven_ephemera', 'widget' );
</span><span class="lines">@@ -49,6 +55,7 @@
</span><span class="cx"> ob_start();
</span><span class="cx"> extract( $args, EXTR_SKIP );
</span><span class="cx">
</span><ins>+ //duplicate_hook
</ins><span class="cx"> $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Ephemera', 'twentyeleven' ) : $instance['title'], $instance, $this->id_base);
</span><span class="cx">
</span><span class="cx"> if ( ! isset( $instance['number'] ) )
</span><span class="lines">@@ -120,8 +127,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Update widget settings.
+ *
</ins><span class="cx"> * Deals with the settings when they are saved by the admin. Here is
</span><span class="cx"> * where any validation should be dealt with.
</span><ins>+ *
+ * @since Twenty Eleven 1.0
</ins><span class="cx"> **/
</span><span class="cx"> function update( $new_instance, $old_instance ) {
</span><span class="cx"> $instance = $old_instance;
</span><span class="lines">@@ -136,12 +147,21 @@
</span><span class="cx"> return $instance;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * Flush widget cache.
+ *
+ * @since Twenty Eleven 1.0
+ */
</ins><span class="cx"> function flush_widget_cache() {
</span><span class="cx"> wp_cache_delete( 'widget_twentyeleven_ephemera', 'widget' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Set up the widget form.
+ *
</ins><span class="cx"> * Displays the form for this widget on the Widgets page of the WP Admin area.
</span><ins>+ *
+ * @since Twenty Eleven 1.0
</ins><span class="cx"> **/
</span><span class="cx"> function form( $instance ) {
</span><span class="cx"> $title = isset( $instance['title']) ? esc_attr( $instance['title'] ) : '';
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenindexphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/index.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/index.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/index.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The main template file.
</del><ins>+ * Main template file
</ins><span class="cx"> *
</span><span class="cx"> * This is the most generic template file in a WordPress theme
</span><span class="cx"> * and one of the two required files for a theme (the other being style.css).
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenpagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/page.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/page.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/page.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying all pages.
</del><ins>+ * Template for displaying all pages
</ins><span class="cx"> *
</span><span class="cx"> * This is the template that displays all pages by default.
</span><span class="cx"> * Please note that this is the WordPress construct of pages
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevensearchphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/search.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/search.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/search.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying Search Results pages.
</del><ins>+ * Template for displaying Search Results pages
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span><span class="lines">@@ -24,9 +24,11 @@
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- /* Include the Post-Format-specific template for the content.
</del><ins>+ /**
+ * Include the Post-Format-specific template for the content.
</ins><span class="cx"> * If you want to overload this in a child theme then include a file
</span><del>- * called content-___.php (where ___ is the Post Format name) and that will be used instead.
</del><ins>+ * called content-___.php (where ___ is the Post Format name) and that
+ * will be used instead.
</ins><span class="cx"> */
</span><span class="cx"> get_template_part( 'content', get_post_format() );
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevensearchformphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/searchform.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/searchform.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/searchform.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template for displaying search forms in Twenty Eleven
</del><ins>+ * Template for displaying search forms in Twenty Eleven
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenshowcasephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/showcase.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/showcase.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/showcase.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,8 +1,9 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><span class="cx"> * Template Name: Showcase Template
</span><del>- * Description: A Page Template that showcases Sticky Posts, Asides, and Blog Posts
</del><span class="cx"> *
</span><ins>+ * Description: A Page Template that showcases Sticky Posts, Asides, and Blog Posts.
+ *
</ins><span class="cx"> * The showcase template in Twenty Eleven consists of a featured posts section using sticky posts,
</span><span class="cx"> * another recent posts area (with the latest post shown in full and the rest as a list)
</span><span class="cx"> * and a left sidebar holding aside posts.
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevensidebarfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/sidebar-footer.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/sidebar-footer.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/sidebar-footer.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The Footer widget areas.
</del><ins>+ * Footer widget areas
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span><span class="lines">@@ -9,7 +9,8 @@
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- /* The footer widget area is triggered if any of the areas
</del><ins>+ /**
+ * The footer widget area is triggered if any of the areas
</ins><span class="cx"> * have widgets. So let's check that first.
</span><span class="cx"> *
</span><span class="cx"> * If none of the sidebars have widgets, then let's bail early.
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevensidebarpagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/sidebar-page.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/sidebar-page.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/sidebar-page.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,8 +1,9 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><span class="cx"> * Template Name: Sidebar Template
</span><del>- * Description: A Page Template that adds a sidebar to pages
</del><span class="cx"> *
</span><ins>+ * Description: A Page Template that adds a sidebar to pages.
+ *
</ins><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span><span class="cx"> * @since Twenty Eleven 1.0
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevensidebarphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/sidebar.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/sidebar.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/sidebar.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The Sidebar containing the main widget area.
</del><ins>+ * Sidebar containing the main widget area
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevensinglephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/single.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/single.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/single.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The Template for displaying all single posts.
</del><ins>+ * Template for displaying all single posts
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyeleventagphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/tag.php (25624 => 25625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/tag.php 2013-09-25 16:35:26 UTC (rev 25624)
+++ trunk/src/wp-content/themes/twentyeleven/tag.php 2013-09-25 16:49:36 UTC (rev 25625)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * The template used to display Tag Archive pages
</del><ins>+ * Template used to display Tag Archive pages
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Twenty_Eleven
</span><span class="lines">@@ -21,8 +21,16 @@
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> $tag_description = tag_description();
</span><del>- if ( ! empty( $tag_description ) )
</del><ins>+ if ( ! empty( $tag_description ) ) {
+ /**
+ * Filter the default Twenty Eleven tag description.
+ *
+ * @since Twenty Eleven 1.0
+ *
+ * @param string The default tag description.
+ */
</ins><span class="cx"> echo apply_filters( 'tag_archive_meta', '<div class="tag-archive-meta">' . $tag_description . '</div>' );
</span><ins>+ }
</ins><span class="cx"> ?>
</span><span class="cx"> </header>
</span><span class="cx">
</span><span class="lines">@@ -32,9 +40,11 @@
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- /* Include the Post-Format-specific template for the content.
</del><ins>+ /**
+ * Include the Post-Format-specific template for the content.
</ins><span class="cx"> * If you want to overload this in a child theme then include a file
</span><del>- * called content-___.php (where ___ is the Post Format name) and that will be used instead.
</del><ins>+ * called content-___.php (where ___ is the Post Format name) and that
+ * will be used instead.
</ins><span class="cx"> */
</span><span class="cx"> get_template_part( 'content', get_post_format() );
</span><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>