<!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>[30569] trunk/src/wp-content/themes/twentyfifteen: Twenty Fifteen: docs correction and cleanup.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/30569">30569</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/30569","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandstewart</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-11-25 20:56:33 +0000 (Tue, 25 Nov 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Twenty Fifteen: docs correction and cleanup.
Props DrewAPicture, see <a href="https://core.trac.wordpress.org/ticket/30149">#30149</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfifteenfunctionsphp">trunk/src/wp-content/themes/twentyfifteen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfifteenincbackcompatphp">trunk/src/wp-content/themes/twentyfifteen/inc/back-compat.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfifteeninccustomheaderphp">trunk/src/wp-content/themes/twentyfifteen/inc/custom-header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfifteeninccustomizerphp">trunk/src/wp-content/themes/twentyfifteen/inc/customizer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfifteeninctemplatetagsphp">trunk/src/wp-content/themes/twentyfifteen/inc/template-tags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyfifteenfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/functions.php 2014-11-25 20:37:42 UTC (rev 30568)
+++ trunk/src/wp-content/themes/twentyfifteen/functions.php 2014-11-25 20:56:33 UTC (rev 30569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,7 +147,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fifteen 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string Google fonts URL for the theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfifteen_fonts_url() {
</span><span class="cx" style="display: block; padding: 0 10px"> $fonts = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,6 +245,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Add featured image as background image to post navigation elements.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fifteen 1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @see wp_add_inline_style()
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfifteen_post_nav_background() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_single() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -290,7 +292,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $item Menu item object.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $depth Depth of the menu.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args wp_nav_menu() arguments.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @return string Menu item with possible description.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfifteen_nav_description( $item_output, $item, $depth, $args ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,9 +308,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fifteen 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $html Search form HTML
- *
- * @return string Modified search form HTML
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $html Search form HTML.
+ * @return string Modified search form HTML.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfifteen_search_form_modify( $html ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return str_replace( 'class="search-submit"', 'class="search-submit screen-reader-text"', $html );
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfifteenincbackcompatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/inc/back-compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/inc/back-compat.php 2014-11-25 20:37:42 UTC (rev 30568)
+++ trunk/src/wp-content/themes/twentyfifteen/inc/back-compat.php 2014-11-25 20:56:33 UTC (rev 30569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,10 +1,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Twenty Fifteen back compat functionality.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Twenty Fifteen back compat functionality
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Prevents Twenty Fifteen from running on WordPress versions prior to 4.1,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * since this theme is not meant to be backward compatible beyond that
- * and relies on many newer functions and markup changes introduced in 4.1.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * since this theme is not meant to be backward compatible beyond that and
+ * relies on many newer functions and markup changes introduced in 4.1.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @package WordPress
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage Twenty_Fifteen
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,4 +60,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( sprintf( __( 'Twenty Fifteen requires at least WordPress version 4.1. You are running version %s. Please upgrade and try again.', 'twentyfifteen' ), $GLOBALS['wp_version'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'template_redirect', 'twentyfifteen_preview' );
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'template_redirect', 'twentyfifteen_preview' );
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfifteeninccustomheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/inc/custom-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/inc/custom-header.php 2014-11-25 20:37:42 UTC (rev 30568)
+++ trunk/src/wp-content/themes/twentyfifteen/inc/custom-header.php 2014-11-25 20:56:33 UTC (rev 30569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Implement Custom Header functionality for Twenty Fifteen.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Custom Header functionality for Twenty Fifteen
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @package WordPress
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage Twenty_Fifteen
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fifteen 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $color The original color, in 3- or 6-digit hexadecimal form.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return array Array containing RGB (red, green, and blue) values for the given
+ * HEX code, empty array otherwise.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfifteen_hex2rgb( $color ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $color = trim( $color, '#' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +72,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Styles the header image and text displayed on the blog.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fifteen 1.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @see twentyfifteen_custom_header_setup().
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @see twentyfifteen_custom_header_setup()
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfifteen_header_style() {
</span><span class="cx" style="display: block; padding: 0 10px"> $header_image = get_header_image();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,6 +175,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Enqueues front-end CSS for the header background color.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fifteen 1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @see wp_add_inline_style()
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfifteen_header_background_color_css() {
</span><span class="cx" style="display: block; padding: 0 10px"> $color_scheme = twentyfifteen_get_color_scheme();
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfifteeninccustomizerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/inc/customizer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/inc/customizer.php 2014-11-25 20:37:42 UTC (rev 30568)
+++ trunk/src/wp-content/themes/twentyfifteen/inc/customizer.php 2014-11-25 20:56:33 UTC (rev 30569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Twenty Fifteen Customizer.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Twenty Fifteen Customizer functionality
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @package WordPress
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage Twenty_Fifteen
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,8 +76,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Register color schemes for Twenty Fifteen.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Can be filtered with twentyfifteen_color_schemes.
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Can be filtered with {@see 'twentyfifteen_color_schemes'}.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * The order of colors in a colors array:
</span><span class="cx" style="display: block; padding: 0 10px"> * 1. Main Background Color.
</span><span class="cx" style="display: block; padding: 0 10px"> * 2. Sidebar Background Color.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,11 +164,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'twentyfifteen_get_color_scheme' ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Returns an array of either the current or default color scheme hex values.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Get the current Twenty Fifteen color scheme.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fifteen 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return array An associative array of either the current or default color scheme hex values.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfifteen_get_color_scheme() {
</span><span class="cx" style="display: block; padding: 0 10px"> $color_scheme_option = get_theme_mod( 'color_scheme', 'default' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,7 +188,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fifteen 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return array Array of color schemes.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfifteen_get_color_scheme_choices() {
</span><span class="cx" style="display: block; padding: 0 10px"> $color_schemes = twentyfifteen_get_color_schemes();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,7 +209,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fifteen 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $value Color scheme name value.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @return string Color scheme name.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfifteen_sanitize_color_scheme( $value ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,6 +226,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Enqueues front-end CSS for color scheme.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fifteen 1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @see wp_add_inline_style()
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfifteen_color_scheme_css() {
</span><span class="cx" style="display: block; padding: 0 10px"> $color_scheme_option = get_theme_mod( 'color_scheme', 'default' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,6 +244,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Binds JS listener to make Customizer color_scheme control.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * Passes color scheme data as colorScheme global.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fifteen 1.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,8 +268,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Output an Underscore template for generating CSS for the color scheme.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The template generates the css dynamically for instant display in the Customizer preview,
- * and to be saved in a `theme_mod` for display on the front-end.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The template generates the css dynamically for instant display in the Customizer
+ * preview, and to be saved in a `theme_mod` for display on the front-end.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fifteen 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfifteeninctemplatetagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/inc/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/inc/template-tags.php 2014-11-25 20:37:42 UTC (rev 30568)
+++ trunk/src/wp-content/themes/twentyfifteen/inc/template-tags.php 2014-11-25 20:56:33 UTC (rev 30569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Custom template tags for this theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Custom template tags for Twenty Fifteen
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Eventually, some of the functionality here could be replaced by core features.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,11 +126,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Returns true if a blog has more than 1 category.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Determine whether blog/site has more than one category.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fifteen 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool True of there is more than one category, false otherwise.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfifteen_categorized_blog() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === ( $all_the_cool_cats = get_transient( 'twentyfifteen_categories' ) ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,7 +159,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Flush out the transients used in twentyfifteen_categorized_blog.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Flush out the transients used in {@see twentyfifteen_categorized_blog()}.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fifteen 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,8 +210,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Falls back to the post permalink if no URL is found in the post.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fifteen 1.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @uses get_url_in_content()
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @see get_url_in_content()
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The Link format URL.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfifteen_get_link_url() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,10 +224,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'twentyfifteen_excerpt_more' ) && ! is_admin() ) :
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Replaces "[...]" (appended to automatically generated excerpts) with ... and a Continue reading link.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Replaces "[...]" (appended to automatically generated excerpts) with ... and a 'Continue reading' link.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fifteen 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string 'Continue reading' link prepended with an ellipsis.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfifteen_excerpt_more( $more ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $link = sprintf( '<a href="%1$s" class="more-link">%2$s</a>',
</span></span></pre>
</div>
</div>
</body>
</html>