Changeset 2944709

Timestamp:

07/28/2023 03:45:01 PM (20 months ago)

Author:

firmcatalyst

Message:

Shortcode critical fix

Location:

fcp-posts-by-search-query/trunk

Files:

• inc/shortcode.php (modified) (2 diffs)
• posts-by-query.php (modified) (2 diffs)
• readme.txt (modified) (1 diff)

fcp-posts-by-search-query/trunk/inc/shortcode.php

@@ -9 +9 @@
 
     if ( is_admin() ) { return; }
+    if ( empty( get_types_to_search_among() ) ) { return; }
 
-    if ( empty( get_types_to_search_among() ) ) { return; }
-    if ( !in_array( get_post_type(), get_types_to_apply_to() ) ) { return; }
+    $queried_id = get_queried_object_id();
+    $post_type = get_post_type( $queried_id );
+
+    if ( !in_array( $post_type, get_types_to_apply_to() ) ) { return; }
+
+    if( !is_singular($post_type) ) { return; }
 
     $settings = get_settings();
-    $queried_id = get_queried_object_id();
 
     // styles
@@ -67 +71 @@
 
     $search_by = $metas[ FCPPBK_PREF.'variants' ] ?? 'list';
+    $unfilled = false;
 
     switch ( $search_by ) {
         case ( 'list' ):
             $ids = unserialize( $metas[ FCPPBK_PREF.'posts' ] );
-            if ( empty( $ids ) ) { return; }
+            if ( empty( $ids ) ) { $unfilled = true; break; }
             $wp_query_args += [ 'post__in' => $ids, 'orderby' => 'post__in' ];
         break;
         case ( 'query' ):
             $query = trim( $metas[ FCPPBK_PREF.'query' ] );
-            if ( $query === '' && $settings['unfilled-behavior'] === 'search-by-title' ) { // ++-- && is_single( $queried_id ) doesn't work somehow
-                $query = trim( get_the_title( $queried_id ) );
-            }
-            if ( $query === '' ) { return; }
+            if ( $query === '' ) { $unfilled = true; break; }
             $wp_query_args += [ 'orderby' => 'date', 'order' => 'DESC', 's' => $query ];
         break;
         default:
-            return;
+            $unfilled = true;
     }
+    
+    if ( $unfilled && $settings['unfilled-behavior'] !== 'search-by-title' ) { return; } // ++ improve the logic
+
+    if ( $unfilled && $settings['unfilled-behavior'] === 'search-by-title' ) { // ++-- && is_single( $queried_id ) doesn't work somehow
+        $query = trim( get_the_title( $queried_id ) );
+        $wp_query_args += [ 'orderby' => 'date', 'order' => 'DESC', 's' => $query ];
+    }
 
     $search = new \WP_Query( $wp_query_args );
 
-    if ( !$search->have_posts() || !( $search->found_posts >= ( $settings['minimum-posts'] ?: 0 ) ) ) { return; }
+    if ( !$search->have_posts() || !( $search->found_posts >= ( $settings['minimum-posts'] ?? 0 ?: 0 ) ) ) { return; }
 
     $get_template = function($name, $is_part = true) {

fcp-posts-by-search-query/trunk/posts-by-query.php

@@ -3 +3 @@
 Plugin Name: FCP Posts by Search Query
 Description: Implement a list of relevant posts to particular pages with a search query or exact list of posts. Easy pick and add.
-Version: 1.0.4
+Version: 1.0.5
 Requires at least: 5.8
 Tested up to: 6.2
@@ -47 +47 @@
     // !!title and description must be more like for printing to understans blah blah check out the competitors
 // after publishing add thumbnails and the preview page
-
+// test for errors and warnings on empty values in settings
 // ++ if Posts by Search Query & Date become empty, the old query still prints what was found
 // ++ turn posts-by-query into a constant and avoid conflict with FCPPBK_SETT

fcp-posts-by-search-query/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.2
 Requires PHP: 7.4
-Stable tag: 1.0.4
+Stable tag: 1.0.5
 Author: Firmcatalyst, Vadim Volkov, Aude Jamier
 Author URI: https://firmcatalyst.com