Merge pull request #1908 from vektor-inc/change/add-pagedlock

【確認待ち（一人でいいかな）】２ページ以降でも１ページにロックする設定を追加

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

@@ -168,12 +168,13 @@ public static function get_loop_query( $attributes ) {
 		global $wp_query;
 		// とりあえず１を入れつつ2ページ目の情報があったら上書き
 		$paged = 1;
-		if ( is_singular() && isset( $wp_query->query_vars['page'] ) ) {
+		if ( ! empty( $attributes['pagedlock'] ) ) {
+			$paged = 1;
+		} elseif ( is_singular() && isset( $wp_query->query_vars['page'] ) ) {
 			$paged = $wp_query->query_vars['page'];
 		} elseif ( isset( $wp_query->query_vars['paged'] ) ) {
 			$paged = $wp_query->query_vars['paged'];
 		}
-
 		$args = array(
 			'post_type'      => $is_checked_post_type,
 			'tax_query'      => self::format_terms( $tax_query_relation, $is_checked_terms ),

inc/vk-components/package/class-vk-component-posts.php

@@ -136,14 +136,12 @@ public static function get_loop( $wp_query, $options, $loop_options = array() )
 			$loop_outer_class_post_types = array();
 			if ( ! isset( $wp_query->query['post_type'] ) ) {
 				$loop_outer_class_post_types[] = 'vk_posts-postType-post';
-			} else {
-				if ( is_array( $wp_query->query['post_type'] ) ) {
-					foreach ( $wp_query->query['post_type'] as $key => $value ) {
-						$loop_outer_class_post_types[] = 'vk_posts-postType-' . $value;
-					}
-				} else {
-					$loop_outer_class_post_types[] = 'vk_posts-postType-' . $wp_query->query['post_type'];
+			} elseif ( is_array( $wp_query->query['post_type'] ) ) {
+				foreach ( $wp_query->query['post_type'] as $key => $value ) {
+					$loop_outer_class_post_types[] = 'vk_posts-postType-' . $value;
 				}
+			} else {
+				$loop_outer_class_post_types[] = 'vk_posts-postType-' . $wp_query->query['post_type'];
 			}
 
 			$loop_outer_class_post_types[] = 'vk_posts-layout-' . $options['layout'];
@@ -207,7 +205,7 @@ public static function get_loop( $wp_query, $options, $loop_options = array() )
 				$vk_posts_loop_item_count = 0;
 
 				while ( $wp_query->have_posts() ) {
-					$vk_posts_loop_item_count++;
+					++$vk_posts_loop_item_count;
 
 					$wp_query->the_post();
 					global $post;