Changeset 27120 for trunk

Timestamp:

02/07/2014 05:38:08 PM (13 years ago)

Author:

lancewillett

Message:

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 #26660.

File:

• trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php (modified) (7 diffs)

trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php

@@ -87 +87 @@
                 add_action( 'customize_register',                 array( __CLASS__, 'customize_register' ), 9 );
                 add_action( 'admin_init',                         array( __CLASS__, 'register_setting'   )    );
+                add_action( 'switch_theme',                       array( __CLASS__, 'delete_transient'   )    );
                 add_action( 'save_post',                          array( __CLASS__, 'delete_transient'   )    );
                 add_action( 'delete_post_tag',                    array( __CLASS__, 'delete_post_tag'    )    );
@@ -169 +170 @@
                 // Query for featured posts.
                 $featured = get_posts( array(
-                        'numberposts' => $settings['quantity'],
+                        'numberposts' => self::$max_posts,
                         'tax_query'   => array(
                                 array(
@@ -204 +205 @@
         public static function get_sticky_posts() {
                 $settings = self::get_setting();
-                return array_slice( get_option( 'sticky_posts', array() ), 0, $settings['quantity'] );
+                return array_slice( get_option( 'sticky_posts', array() ), 0, self::$max_posts );
         }
 
@@ -475 +476 @@
                 $defaults = array(
                         'hide-tag' => 1,
-                        'quantity' => 6,
                         'tag-id'   => 0,
                         'tag-name' => 'featured',
@@ -482 +482 @@
                 $options = wp_parse_args( $saved, $defaults );
                 $options = array_intersect_key( $options, $defaults );
-                $options['quantity'] = self::sanitize_quantity( $options['quantity'] );
 
                 if ( 'all' != $key ) {
@@ -526 +525 @@
                 }
 
-                if ( isset( $input['quantity'] ) ) {
-                        $output['quantity'] = self::sanitize_quantity( $input['quantity'] );
-                }
-
                 $output['hide-tag'] = isset( $input['hide-tag'] ) && $input['hide-tag'] ? 1 : 0;
 
@@ -537 +532 @@
                 return $output;
         }
-
-        /**
-         * 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;
-        }
-
 } // Featured_Content