| @@ -245,17 +245,13 @@ | ||
| 245 | 245 | |
| 246 | 246 | $this->args['paginate'] = true; |
| 247 | 247 | $this->args['limit'] = $posts_per_page; |
| 248 | 248 | |
| 249 | - // Prefer `paged` (archive pagination), fall back to `page` (paginated singular posts). | |
| 250 | - // Handles the case where the shop/archive is set as the front page. | |
| 251 | - $paged = get_query_var( 'paged' ); | |
| 252 | - if ( ! $paged ) { | |
| 253 | - $paged = get_query_var( 'page' ); | |
| 249 | + if ( is_front_page() ) { | |
| 250 | + $paged = ( get_query_var( 'page' ) ) ? get_query_var( 'page' ) : 1; | |
| 251 | + } else { | |
| 252 | + $paged = ( get_query_var( 'paged' ) ) ? get_query_var( 'paged' ) : 1; | |
| 254 | 253 | } |
| 255 | - if ( ! $paged ) { | |
| 256 | - $paged = 1; | |
| 257 | - } | |
| 258 | 254 | |
| 259 | 255 | $offset = $posts_per_page * ( (int) $paged - 1 ); |
| 260 | 256 | $this->args['page'] = $paged; |
| 261 | 257 | |
| @@ -278,18 +274,13 @@ | ||
| 278 | 274 | * @return void |
| 279 | 275 | */ |
| 280 | 276 | private function tax_params(): void { |
| 281 | 277 | $categories = isset( $this->meta['categories'] ) ? array_filter( $this->meta['categories'] ) : []; |
| 282 | - $brands = isset( $this->meta['brands'] ) ? array_filter( $this->meta['brands'] ) : []; | |
| 283 | 278 | $tags = isset( $this->meta['tags'] ) ? array_filter( $this->meta['tags'] ) : []; |
| 284 | 279 | $attributes = isset( $this->meta['attributes'] ) ? array_filter( $this->meta['attributes'] ) : []; |
| 285 | 280 | |
| 286 | 281 | if ( ! empty( $categories ) ) { |
| 287 | 282 | $this->args['product_category_id'] = $categories; |
| 288 | - } | |
| 289 | - | |
| 290 | - if ( ! empty( $brands ) ) { | |
| 291 | - $this->args['product_brand_id'] = $brands; | |
| 292 | 283 | } |
| 293 | 284 | |
| 294 | 285 | if ( ! empty( $tags ) ) { |
| 295 | 286 | $this->args['product_tag_id'] = $tags; |
