From 061597dff87eaf8861f0e0ab41e9b243c9d87a8e Mon Sep 17 00:00:00 2001 From: Kat Hagan Date: Sun, 4 Oct 2015 22:26:28 -0700 Subject: [PATCH] Infinite Scroll: Don't clobber the posts_per_page setting if set This fixes one of the issues I reported in #2807. --- modules/infinite-scroll/infinity.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/infinite-scroll/infinity.php b/modules/infinite-scroll/infinity.php index 49f49d2e93924..006bdddfa556a 100644 --- a/modules/infinite-scroll/infinity.php +++ b/modules/infinite-scroll/infinity.php @@ -211,13 +211,15 @@ static function get_settings() { $settings['type'] = 'click'; } - // Ignore posts_per_page theme setting for [click] type - if ( 'click' == $settings['type'] ) - $settings['posts_per_page'] = (int) get_option( 'posts_per_page' ); - - // Backwards compatibility for posts_per_page setting - elseif ( false === $settings['posts_per_page'] ) - $settings['posts_per_page'] = 7; + // posts_per_page defaults to 7 for scroll, posts_per_page option for click + if ( false === $settings['posts_per_page'] ) { + if ( 'scroll' === $settings['type'] ) { + $settings['posts_per_page'] = 7; + } + else { + $settings['posts_per_page'] = (int) get_option( 'posts_per_page' ); + } + } // Force display of the click handler and attendant bits when the type isn't `click` if ( 'click' !== $settings['type'] ) {