| @@ -156,8 +156,9 @@ | ||
| 156 | 156 | $this->add_group_control( |
| 157 | 157 | Group_Control_Image_Size::get_type(), |
| 158 | 158 | [ |
| 159 | 159 | 'name' => 'primary_thumbnail', |
| 160 | + // phpcs:ignore WordPressVIPMinimum.Performance.WPQueryParams.PostNotIn_exclude -- Elementor widget query built from user-configured controls; expected behaviour. | |
| 160 | 161 | 'exclude' => ['custom'], |
| 161 | 162 | 'default' => 'medium', |
| 162 | 163 | ] |
| 163 | 164 | ); |
| @@ -223,8 +224,11 @@ | ||
| 223 | 224 | ], |
| 224 | 225 | 'default' => [ |
| 225 | 226 | 'size' => 6, |
| 226 | 227 | ], |
| 228 | + 'condition' => [ | |
| 229 | + 'posts_source!' => 'current_query', | |
| 230 | + ] | |
| 227 | 231 | ] |
| 228 | 232 | ); |
| 229 | 233 | |
| 230 | 234 | $this->register_query_builder_controls(); |
| @@ -883,9 +887,9 @@ | ||
| 883 | 887 | [ |
| 884 | 888 | 'label' => esc_html__('Arrow Size', 'ultimate-post-kit'), |
| 885 | 889 | 'type' => Controls_Manager::SLIDER, |
| 886 | 890 | 'selectors' => [ |
| 887 | - '{{WRAPPER}} ul.upk-pagination li a svg' => 'height: {{SIZE}}px; width: auto;', | |
| 891 | + '{{WRAPPER}} ul.upk-pagination li a i' => 'font-size: {{SIZE}}px;', | |
| 888 | 892 | ], |
| 889 | 893 | ] |
| 890 | 894 | ); |
| 891 | 895 | |
| @@ -988,23 +992,35 @@ | ||
| 988 | 992 | $this->register_ajax_loadmore_style_controls(); |
| 989 | 993 | } |
| 990 | 994 | |
| 991 | 995 | /** |
| 992 | - * Main query render for this widget | |
| 993 | - * @param $posts_per_page number item query limit | |
| 994 | - */ | |
| 995 | - public function query_posts($posts_per_page) | |
| 996 | - { | |
| 997 | - $default = $this->getGroupControlQueryArgs(); | |
| 998 | - $args = []; | |
| 999 | - if ($posts_per_page) { | |
| 1000 | - $args['posts_per_page'] = $posts_per_page; | |
| 1001 | - $args['paged'] = max(1, get_query_var('paged'), get_query_var('page')); | |
| 1002 | - } | |
| 1003 | - $args = array_merge($default, $args); | |
| 1004 | - $this->_query = new WP_Query($args); | |
| 1005 | - } | |
| 996 | + * Get post query builder arguments | |
| 997 | + */ | |
| 998 | + public function query_posts( $posts_per_page ) { | |
| 999 | + $settings = $this->get_settings(); | |
| 1000 | + $posts_per_page = isset( $posts_per_page ) ? (int) $posts_per_page : 0; | |
| 1001 | + $args = $this->getGroupControlQueryArgs(); | |
| 1002 | + $is_current_query = ( ! empty( $settings['posts_source'] ) && $settings['posts_source'] === 'current_query' ); | |
| 1006 | 1003 | |
| 1004 | + if ( $is_current_query ) { | |
| 1005 | + unset( $args['offset'] ); | |
| 1006 | + unset( $args['no_found_rows'] ); | |
| 1007 | + $posts_per_page = 0; | |
| 1008 | + } | |
| 1009 | + | |
| 1010 | + if ( $posts_per_page > 0 ) { | |
| 1011 | + $args['posts_per_page'] = $posts_per_page; | |
| 1012 | + } else { | |
| 1013 | + $args['posts_per_page'] = (int) get_option( 'posts_per_page', 10 ); | |
| 1014 | + } | |
| 1015 | + | |
| 1016 | + if ( $settings['show_pagination'] ) { | |
| 1017 | + $args['paged'] = max( 1, (int) get_query_var( 'paged' ), (int) get_query_var( 'page' ) ); | |
| 1018 | + } | |
| 1019 | + | |
| 1020 | + $this->_query = new \WP_Query( $args ); | |
| 1021 | + } | |
| 1022 | + | |
| 1007 | 1023 | public function render_comments($id = 0) |
| 1008 | 1024 | { |
| 1009 | 1025 | |
| 1010 | 1026 | if (!$this->get_settings('show_comments')) { |
| @@ -1012,10 +1028,10 @@ | ||
| 1012 | 1028 | } |
| 1013 | 1029 | ?> |
| 1014 | 1030 | |
| 1015 | 1031 | <div class="upk-comments upk-flex upk-flex-middle"> |
| 1016 | - <i class="upk-icon-post-comments"></i> | |
| 1017 | - <span><?php echo get_comments_number($id) ?></span> | |
| 1032 | + <i class="upk-icon-post-comments" aria-hidden="true"></i> | |
| 1033 | + <span><?php echo esc_html( $this->upk_get_localized_comment_count( $id ) ); ?></span> | |
| 1018 | 1034 | </div> |
| 1019 | 1035 | |
| 1020 | 1036 | <?php |
| 1021 | 1037 | } |
| @@ -1044,14 +1060,14 @@ | ||
| 1044 | 1060 | <div class="upk-meta upk-flex-inline upk-flex-middle"> |
| 1045 | 1061 | <?php $this->render_date();?> |
| 1046 | 1062 | <?php if (_is_upk_pro_activated()): |
| 1047 | 1063 | if ('yes' === $settings['show_reading_time']): ?> |
| 1048 | - <div class="upk-reading-time" data-separator="<?php echo esc_html($settings['meta_separator']); ?>"> | |
| 1064 | + <div class="upk-reading-time" data-separator="<?php echo esc_attr($settings['meta_separator']); ?>"> | |
| 1049 | 1065 | <?php echo esc_html( ultimate_post_kit_reading_time( get_the_content(), $settings['avg_reading_speed'], $settings['hide_seconds'] ?? 'no', $settings['hide_minutes'] ?? 'no' ) );?> |
| 1050 | 1066 | </div> |
| 1051 | 1067 | <?php endif;?> |
| 1052 | 1068 | <?php endif;?> |
| 1053 | - <div data-separator="<?php echo esc_html($settings['meta_separator']); ?>"> | |
| 1069 | + <div data-separator="<?php echo esc_attr($settings['meta_separator']); ?>"> | |
| 1054 | 1070 | <?php $this->render_comments($post_id);?> |
| 1055 | 1071 | </div> |
| 1056 | 1072 | </div> |
| 1057 | 1073 | <?php endif;?> |
