| @@ -245,12 +245,16 @@ | ||
| 245 | 245 | |
| 246 | 246 | $this->args['paginate'] = true; |
| 247 | 247 | $this->args['limit'] = $posts_per_page; |
| 248 | 248 | |
| 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; | |
| 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' ); | |
| 254 | + } | |
| 255 | + if ( ! $paged ) { | |
| 256 | + $paged = 1; | |
| 253 | 257 | } |
| 254 | 258 | |
| 255 | 259 | $offset = $posts_per_page * ( (int) $paged - 1 ); |
| 256 | 260 | $this->args['page'] = $paged; |
