Merge pull request #2383 from vektor-inc/develop

[ Change version ] 1.93.1.0

inc/vk-blocks/view/class-vk-blocks-postlist.php

@@ -143,7 +143,8 @@ public static function get_loop_query( $attributes ) {
 			$post__not_in = array( get_the_ID() );
 		}
 
-		$offset = isset( $attributes['offset'] ) ? intval( $attributes['offset'] ) : 0;
+		$offset         = isset( $attributes['offset'] ) ? intval( $attributes['offset'] ) : 0;
+		$posts_per_page = isset( $attributes['numberPosts'] ) ? intval( $attributes['numberPosts'] ) : 0;
 
 		$date_query = array();
 		if ( ! empty( $attributes['targetPeriod'] ) ) {
@@ -179,14 +180,17 @@ public static function get_loop_query( $attributes ) {
 		}
 
 		global $wp_query;
+
 		// とりあえず１を入れつつ2ページ目の情報があったら上書き
 		$paged = 1;
 		if ( ! empty( $attributes['pagedlock'] ) ) {
 			$paged = 1;
 		} elseif ( is_singular() && isset( $wp_query->query_vars['page'] ) ) {
-			$paged = $wp_query->query_vars['page'];
+			$paged  = $wp_query->query_vars['page'] ? $wp_query->query_vars['page'] : 1;
+			$offset = $offset + $posts_per_page * ( $paged - 1 );
 		} elseif ( isset( $wp_query->query_vars['paged'] ) ) {
-			$paged = $wp_query->query_vars['paged'];
+			$paged  = $wp_query->query_vars['paged'] ? $wp_query->query_vars['paged'] : 1;
+			$offset = $offset + $posts_per_page * ( $paged - 1 );
 		}
 
 		$args = array(
@@ -195,16 +199,19 @@ public static function get_loop_query( $attributes ) {
 			'tax_query'              => ! empty( $is_checked_terms ) ? self::format_terms( $tax_query_relation, $is_checked_terms, $is_checked_post_type ) : array(),
 			'paged'                  => $paged,
 			// 0で全件取得
-			'posts_per_page'         => intval( $attributes['numberPosts'] ),
+			'posts_per_page'         => $posts_per_page,
 			'order'                  => $attributes['order'],
 			'orderby'                => $attributes['orderby'],
-			'offset'                 => $offset,
 			'post__not_in'           => array_map( 'intval', $post__not_in ),
 			'date_query'             => $date_query,
 			'update_post_meta_cache' => false,
 			'no_found_rows'          => true,
 		);
 
+		if ( ! is_null( $offset ) ) {
+			$args['offset'] = $offset;
+		}
+
 		if ( ! empty( $date_query ) ) {
 			$args['date_query'] = $date_query;
 		}