WordPress.org

Make WordPress Core

Changeset 25814


Ignore:
Timestamp:
10/16/2013 06:28:11 PM (6 years ago)
Author:
lancewillett
Message:

Twenty Fourteen: cleanup, props iamtakashi. Fixes #25613.

  • With the ephemera widget in place, content-recent-formatted-post.php is unused, see #25028.
  • We're no longe filtering formatted posts from the main query, see #25330.
    • Fix a typo.
Location:
trunk/src/wp-content/themes/twentyfourteen
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-content/themes/twentyfourteen/functions.php

    r25808 r25814  
    358358
    359359/**
    360  * Get recent formatted posts that are not featured in Featured Content area.
    361  *
    362  * @since Twenty Fourteen 1.0
    363  *
    364  * @return object WP_Query
    365  */
    366 function twentyfourteen_get_recent( $post_format ) {
    367     $args = array(
    368         'order' => 'DESC',
    369         'ignore_sticky_posts' => 1,
    370         'posts_per_page' => 2,
    371         'tax_query' => array(
    372             array(
    373                 'taxonomy' => 'post_format',
    374                 'terms' => array( $post_format ),
    375                 'field' => 'slug',
    376                 'operator' => 'IN',
    377             ),
    378         ),
    379         'no_found_rows' => true,
    380     );
    381 
    382     $featured_posts = twentyfourteen_get_featured_posts();
    383 
    384     if ( is_array( $featured_posts ) && ! empty( $featured_posts ) )
    385         $args['post__not_in'] = wp_list_pluck( $featured_posts, 'ID' );
    386 
    387     return new WP_Query( $args );
    388 }
    389 
    390 /**
    391  * Filter the home page posts, and remove formatted posts visible in the sidebar from it
    392  *
    393  * @since Twenty Fourteen 1.0
    394  *
    395  * @return void
    396  */
    397 function twentyfourteen_pre_get_posts( $query ) {
    398     // Bail if not home, not a query, not main query.
    399     if ( ! $query->is_main_query() || is_admin() )
    400         return;
    401 
    402     // Only on the home page
    403     if ( $query->is_home() ) {
    404         $exclude_ids = array();
    405 
    406         $videos = twentyfourteen_get_recent( 'post-format-video' );
    407         $images = twentyfourteen_get_recent( 'post-format-image' );
    408         $galleries = twentyfourteen_get_recent( 'post-format-gallery' );
    409         $asides = twentyfourteen_get_recent( 'post-format-aside' );
    410         $links = twentyfourteen_get_recent( 'post-format-link' );
    411         $quotes = twentyfourteen_get_recent( 'post-format-quote' );
    412 
    413         foreach ( $videos->posts as $post )
    414             $exclude_ids[] = $post->ID;
    415 
    416         foreach ( $images->posts as $post )
    417             $exclude_ids[] = $post->ID;
    418 
    419         foreach ( $galleries->posts as $post )
    420             $exclude_ids[] = $post->ID;
    421 
    422         foreach ( $asides->posts as $post )
    423             $exclude_ids[] = $post->ID;
    424 
    425         foreach ( $links->posts as $post )
    426             $exclude_ids[] = $post->ID;
    427 
    428         foreach ( $quotes->posts as $post )
    429             $exclude_ids[] = $post->ID;
    430 
    431         $query->set( 'post__not_in', $exclude_ids );
    432     }
    433 }
    434 add_action( 'pre_get_posts', 'twentyfourteen_pre_get_posts' );
    435 
    436 /**
    437360 * Extend the default WordPress body classes.
    438361 *
  • trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php

    r25813 r25814  
    3131     */
    3232    public static function setup() {
    33         add_action( 'init', array( __CLASS____, 'init' ), 30 );
     33        add_action( 'init', array( __CLASS__, 'init' ), 30 );
    3434    }
    3535
Note: See TracChangeset for help on using the changeset viewer.