diff options
Diffstat (limited to 'plugins/jetpack/modules/infinite-scroll')
| -rw-r--r-- | plugins/jetpack/modules/infinite-scroll/infinity.js | 17 | ||||
| -rw-r--r-- | plugins/jetpack/modules/infinite-scroll/infinity.php | 71 |
2 files changed, 54 insertions, 34 deletions
diff --git a/plugins/jetpack/modules/infinite-scroll/infinity.js b/plugins/jetpack/modules/infinite-scroll/infinity.js index a52cbfd0..010b7148 100644 --- a/plugins/jetpack/modules/infinite-scroll/infinity.js +++ b/plugins/jetpack/modules/infinite-scroll/infinity.js @@ -70,7 +70,7 @@ Scroller = function( settings ) { self.thefooter(); // Fire the refresh self.refresh(); - self.determineURL(); // determine the url + self.determineURL(); // determine the url } }, 250 ); @@ -131,13 +131,14 @@ Scroller.prototype.render = function( response ) { */ Scroller.prototype.query = function() { return { - page : this.page + this.offset, // Load the next page. - currentday : this.currentday, - order : this.order, - scripts : window.infiniteScroll.settings.scripts, - styles : window.infiniteScroll.settings.styles, - query_args : window.infiniteScroll.settings.query_args, - last_post_date : window.infiniteScroll.settings.last_post_date + page : this.page + this.offset, // Load the next page. + currentday : this.currentday, + order : this.order, + scripts : window.infiniteScroll.settings.scripts, + styles : window.infiniteScroll.settings.styles, + query_args : window.infiniteScroll.settings.query_args, + query_before : window.infiniteScroll.settings.query_before, + last_post_date: window.infiniteScroll.settings.last_post_date }; }; diff --git a/plugins/jetpack/modules/infinite-scroll/infinity.php b/plugins/jetpack/modules/infinite-scroll/infinity.php index 6c156983..896db249 100644 --- a/plugins/jetpack/modules/infinite-scroll/infinity.php +++ b/plugins/jetpack/modules/infinite-scroll/infinity.php @@ -372,11 +372,31 @@ class The_Neverending_Home_Page { if ( ! current_theme_supports( 'infinite-scroll' ) ) return; + if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) { + // This setting is no longer configurable in wp-admin on WordPress.com -- leave a pointer + add_settings_field( self::$option_name_enabled, + '<span id="infinite-scroll-options">' . esc_html__( 'Infinite Scroll Behavior', 'jetpack' ) . '</span>', + array( $this, 'infinite_setting_html_calypso_placeholder' ), + 'reading' + ); + return; + } + // Add the setting field [infinite_scroll] and place it in Settings > Reading add_settings_field( self::$option_name_enabled, '<span id="infinite-scroll-options">' . esc_html__( 'Infinite Scroll Behavior', 'jetpack' ) . '</span>', array( $this, 'infinite_setting_html' ), 'reading' ); register_setting( 'reading', self::$option_name_enabled, 'esc_attr' ); } + function infinite_setting_html_calypso_placeholder() { + $details = get_blog_details(); + echo '<span>' . sprintf( + /* translators: Variables are the enclosing link to the settings page */ + esc_html__( 'This option has moved. You can now manage it %1$shere%2$s.' ), + '<a href="' . esc_url( 'https://wordpress.com/settings/writing/' . $details->domain ) . '">', + '</a>' + ) . '</span>'; + } + /** * HTML code to display a checkbox true/false option * for the infinite_scroll setting. @@ -629,9 +649,9 @@ class The_Neverending_Home_Page { } /** - * Create a where clause that will make sure post queries - * will always return results prior to (descending sort) - * or before (ascending sort) the last post date. + * Create a where clause that will make sure post queries return posts + * in the correct order, without duplicates, if a new post is added + * and we're sorting by post date. * * @global $wpdb * @param string $where @@ -645,18 +665,19 @@ class The_Neverending_Home_Page { global $wpdb; $sort_field = self::get_query_sort_field( $query ); - if ( false == $sort_field ) - return $where; - $last_post_date = $_REQUEST['last_post_date']; - // Sanitize timestamp - if ( empty( $last_post_date ) || !preg_match( '|\d{4}\-\d{2}\-\d{2}|', $last_post_date ) ) + if ( 'post_date' !== $sort_field || 'DESC' !== $_REQUEST['query_args']['order'] ) { return $where; + } + + $query_before = sanitize_text_field( wp_unslash( $_REQUEST['query_before'] ) ); - $operator = 'ASC' == $_REQUEST['query_args']['order'] ? '>' : '<'; + if ( empty( $query_before ) ) { + return $where; + } // Construct the date query using our timestamp - $clause = $wpdb->prepare( " AND {$wpdb->posts}.{$sort_field} {$operator} %s", $last_post_date ); + $clause = $wpdb->prepare( " AND {$wpdb->posts}.post_date <= %s", $query_before ); /** * Filter Infinite Scroll's SQL date query making sure post queries @@ -667,10 +688,12 @@ class The_Neverending_Home_Page { * * @param string $clause SQL Date query. * @param object $query Query. - * @param string $operator Query operator. - * @param string $last_post_date Last Post Date timestamp. + * @param string $operator @deprecated Query operator. + * @param string $last_post_date @deprecated Last Post Date timestamp. */ - $where .= apply_filters( 'infinite_scroll_posts_where', $clause, $query, $operator, $last_post_date ); + $operator = 'ASC' === $_REQUEST['query_args']['order'] ? '>' : '<'; + $last_post_date = sanitize_text_field( wp_unslash( $_REQUEST['last_post_date'] ) ); + $where .= apply_filters( 'infinite_scroll_posts_where', $clause, $query, $operator, $last_post_date ); } return $where; @@ -839,6 +862,7 @@ class The_Neverending_Home_Page { 'parameters' => self::get_request_parameters(), ), 'query_args' => self::get_query_vars(), + 'query_before' => current_time( 'mysql' ), 'last_post_date' => self::get_last_post_date(), 'body_class' => self::body_class(), ); @@ -1200,17 +1224,6 @@ class The_Neverending_Home_Page { $previousday = $_REQUEST['currentday']; } - $sticky = get_option( 'sticky_posts' ); - $post__not_in = self::wp_query()->get( 'post__not_in' ); - - //we have to take post__not_in args into consideration here not only sticky posts - if ( true === isset( $_REQUEST['query_args']['post__not_in'] ) ) { - $post__not_in = array_merge( $post__not_in, array_map( 'intval', (array) $_REQUEST['query_args']['post__not_in'] ) ); - } - - if ( ! empty( $post__not_in ) ) - $sticky = array_unique( array_merge( $sticky, $post__not_in ) ); - $post_status = array( 'publish' ); if ( current_user_can( 'read_private_posts' ) ) array_push( $post_status, 'private' ); @@ -1221,7 +1234,6 @@ class The_Neverending_Home_Page { 'paged' => $page, 'post_status' => $post_status, 'posts_per_page' => self::posts_per_page(), - 'post__not_in' => ( array ) $sticky, 'order' => $order ) ); @@ -1246,7 +1258,6 @@ class The_Neverending_Home_Page { */ $query_args = apply_filters( 'infinite_scroll_query_args', $query_args ); - // Add query filter that checks for posts below the date add_filter( 'posts_where', array( $this, 'query_time_filter' ), 10, 2 ); $GLOBALS['wp_the_query'] = $GLOBALS['wp_query'] = $infinite_scroll_query = new WP_Query(); @@ -1607,6 +1618,14 @@ add_action( 'init', 'the_neverending_home_page_init', 20 ); * If so, include the files which add theme support. */ function the_neverending_home_page_theme_support() { + if ( + defined( 'IS_WPCOM' ) && IS_WPCOM && + defined( 'REST_API_REQUEST' ) && REST_API_REQUEST && + ! doing_action( 'restapi_theme_after_setup_theme' ) + ) { + // Don't source theme compat files until we're in the site's context + return; + } $theme_name = get_stylesheet(); /** |