| @@ -21,17 +21,15 @@ | ||
| 21 | 21 | * @var string post ID. |
| 22 | 22 | */ |
| 23 | 23 | |
| 24 | 24 | /** |
| 25 | - * Filtered content. | |
| 25 | + * Filtered content | |
| 26 | 26 | * |
| 27 | - * @param mixed $view_options Shortcode options. | |
| 28 | - * @param mixed $pcp_gl_id shortcode id. | |
| 29 | - * @param mixed $layout Upper layout based options. | |
| 30 | - * @return array | |
| 27 | + * @param integer $pcp_gl_id Shortcode ID. | |
| 28 | + * @return statement | |
| 31 | 29 | */ |
| 32 | - public static function get_filtered_content( $view_options, $pcp_gl_id, $layout ) { | |
| 33 | - | |
| 30 | + public static function get_filtered_content( $pcp_gl_id ) { | |
| 31 | + $view_options = get_post_meta( $pcp_gl_id, 'sp_pcp_view_options', true ); | |
| 34 | 32 | $pcp_post_type = isset( $view_options['pcp_select_post_type'] ) && ! empty( $view_options['pcp_select_post_type'] ) ? $view_options['pcp_select_post_type'] : 'any'; |
| 35 | 33 | $post_limit = isset( $view_options['pcp_post_limit'] ) ? $view_options['pcp_post_limit'] : ''; |
| 36 | 34 | $post_per_page = isset( $view_options['post_per_page'] ) ? $view_options['post_per_page'] : ''; |
| 37 | 35 | $post_offset = isset( $view_options['pcp_post_offset'] ) ? $view_options['pcp_post_offset'] : 0; |
| @@ -37,16 +35,22 @@ | ||
| 37 | 35 | $post_offset = isset( $view_options['pcp_post_offset'] ) ? $view_options['pcp_post_offset'] : 0; |
| 38 | 36 | $pcp_sticky_post = isset( $view_options['pcp_sticky_post'] ) ? $view_options['pcp_sticky_post'] : 0; |
| 39 | 37 | $post_per_page = ( $post_per_page > $post_limit ) ? $post_limit : $post_per_page; |
| 40 | 38 | |
| 41 | - $paged_var = 'paged' . $pcp_gl_id; | |
| 42 | - $paged = ( ! empty( $_GET[ "$paged_var" ] ) ) ? sanitize_text_field( wp_unslash( $_GET[ "$paged_var" ] ) ) : 1; | |
| 39 | + if ( get_query_var( 'paged' ) ) { | |
| 40 | + $paged = get_query_var( 'paged' ); | |
| 41 | + } elseif ( get_query_var( 'page' ) ) { | |
| 42 | + $paged = get_query_var( 'page' ); | |
| 43 | + } else { | |
| 44 | + $paged = 1; | |
| 45 | + } | |
| 43 | 46 | |
| 44 | - $post_per_page = SP_PC_Functions::pcp_post_per_page( $post_limit, $post_per_page, $paged ); | |
| 47 | + $post_per_page = SP_PC_Functions::pcp_post_per_page( $post_limit, $post_per_page, $paged ); | |
| 45 | 48 | if ( $post_per_page < 1 ) { |
| 46 | 49 | $post_per_page = isset( $view_options['post_per_page'] ) ? $view_options['post_per_page'] : ''; |
| 47 | 50 | } |
| 48 | 51 | $offset = (int) $post_per_page * ( $paged - 1 ); |
| 52 | + $layout = get_post_meta( $pcp_gl_id, 'sp_pcp_layouts', true ); | |
| 49 | 53 | $layout_preset = isset( $layout['pcp_layout_preset'] ) ? $layout['pcp_layout_preset'] : ''; |
| 50 | 54 | $sticky_post_position = 'top_list' === $pcp_sticky_post ? 0 : 1; |
| 51 | 55 | |
| 52 | 56 | if ( 'carousel_layout' === $layout_preset ) { |
| @@ -118,9 +122,9 @@ | ||
| 118 | 122 | $terms = isset( $tax_type['pcp_select_terms'] ) ? $tax_type['pcp_select_terms'] : ''; |
| 119 | 123 | if ( $taxonomy ) { |
| 120 | 124 | if ( $terms ) { |
| 121 | 125 | $operator = isset( $tax_type['pcp_taxonomy_term_operator'] ) ? $tax_type['pcp_taxonomy_term_operator'] : ''; |
| 122 | - if ( 'AND' === $operator && 1 === count( $terms ) ) { | |
| 126 | + if ( 'AND' === $operator && 1 == count( $terms ) ) { | |
| 123 | 127 | $operator = 'IN'; |
| 124 | 128 | } |
| 125 | 129 | $tax_settings[] = array( |
| 126 | 130 | 'taxonomy' => $taxonomy, |
