<!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>[27120] trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php: Twenty Fourteen: delete the `featured_content_ids` transient on theme switch to make sure child themes can override the Featured Content quantity value.</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/27120">27120</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2014-02-07 17:38:08 +0000 (Fri, 07 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Fourteen: delete the `featured_content_ids` transient on theme switch to make sure child themes can override the Featured Content quantity value. Also remove quantity parameter so child themes can change the amount of featured posts with `$max_posts`.
Props obenland, see <a href="http://core.trac.wordpress.org/ticket/26660">#26660</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteenincfeaturedcontentphp">trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyfourteenincfeaturedcontentphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php (27119 => 27120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php 2014-02-07 17:32:31 UTC (rev 27119)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php 2014-02-07 17:38:08 UTC (rev 27120)
</span><span class="lines">@@ -86,6 +86,7 @@
</span><span class="cx"> add_filter( $filter, array( __CLASS__, 'get_featured_posts' ) );
</span><span class="cx"> add_action( 'customize_register', array( __CLASS__, 'customize_register' ), 9 );
</span><span class="cx"> add_action( 'admin_init', array( __CLASS__, 'register_setting' ) );
</span><ins>+ add_action( 'switch_theme', array( __CLASS__, 'delete_transient' ) );
</ins><span class="cx"> add_action( 'save_post', array( __CLASS__, 'delete_transient' ) );
</span><span class="cx"> add_action( 'delete_post_tag', array( __CLASS__, 'delete_post_tag' ) );
</span><span class="cx"> add_action( 'customize_controls_enqueue_scripts', array( __CLASS__, 'enqueue_scripts' ) );
</span><span class="lines">@@ -168,7 +169,7 @@
</span><span class="cx">
</span><span class="cx"> // Query for featured posts.
</span><span class="cx"> $featured = get_posts( array(
</span><del>- 'numberposts' => $settings['quantity'],
</del><ins>+ 'numberposts' => self::$max_posts,
</ins><span class="cx"> 'tax_query' => array(
</span><span class="cx"> array(
</span><span class="cx"> 'field' => 'term_id',
</span><span class="lines">@@ -203,7 +204,7 @@
</span><span class="cx"> */
</span><span class="cx"> public static function get_sticky_posts() {
</span><span class="cx"> $settings = self::get_setting();
</span><del>- return array_slice( get_option( 'sticky_posts', array() ), 0, $settings['quantity'] );
</del><ins>+ return array_slice( get_option( 'sticky_posts', array() ), 0, self::$max_posts );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -474,14 +475,12 @@
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><span class="cx"> 'hide-tag' => 1,
</span><del>- 'quantity' => 6,
</del><span class="cx"> 'tag-id' => 0,
</span><span class="cx"> 'tag-name' => 'featured',
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $options = wp_parse_args( $saved, $defaults );
</span><span class="cx"> $options = array_intersect_key( $options, $defaults );
</span><del>- $options['quantity'] = self::sanitize_quantity( $options['quantity'] );
</del><span class="cx">
</span><span class="cx"> if ( 'all' != $key ) {
</span><span class="cx"> return isset( $options[ $key ] ) ? $options[ $key ] : false;
</span><span class="lines">@@ -525,10 +524,6 @@
</span><span class="cx"> $output['tag-name'] = $input['tag-name'];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( isset( $input['quantity'] ) ) {
- $output['quantity'] = self::sanitize_quantity( $input['quantity'] );
- }
-
</del><span class="cx"> $output['hide-tag'] = isset( $input['hide-tag'] ) && $input['hide-tag'] ? 1 : 0;
</span><span class="cx">
</span><span class="cx"> // Delete the featured post ids transient.
</span><span class="lines">@@ -536,29 +531,6 @@
</span><span class="cx">
</span><span class="cx"> return $output;
</span><span class="cx"> }
</span><del>-
- /**
- * Sanitize quantity of featured posts.
- *
- * @static
- * @access public
- * @since Twenty Fourteen 1.0
- *
- * @param int $input The value to sanitize.
- * @return int A number between 1 and FeaturedContent::$max_posts.
- */
- public static function sanitize_quantity( $input ) {
- $quantity = absint( $input );
-
- if ( $quantity > self::$max_posts ) {
- $quantity = self::$max_posts;
- } else if ( 1 > $quantity ) {
- $quantity = 1;
- }
-
- return $quantity;
- }
-
</del><span class="cx"> } // Featured_Content
</span><span class="cx">
</span><span class="cx"> Featured_Content::setup();
</span></span></pre>
</div>
</div>
</body>
</html>