Changeset 3103729

Timestamp:

06/17/2024 07:22:55 PM (22 months ago)

Author:

5um17

Message:

Fixed issue with WP Query Loop block

Location:

wp-extended-search/trunk

Files:

• assets/css/select2.min.css (added)
• assets/js/select2.min.js (added)
• includes/admin/class-wpes-admin.php (modified) (1 diff)
• includes/class-wpes-core.php (modified) (5 diffs)
• languages/wp-extended-search.pot (modified) (1 diff)

wp-extended-search/trunk/includes/admin/class-wpes-admin.php

@@ -149 +149 @@
         if ( 'toplevel_page_wp-es' === $hook ) {
             wp_enqueue_script( 'jquery-ui-datepicker' );
-            wp_enqueue_script( 'wpes_select2_js', 'https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js' );
+            wp_enqueue_script( 'wpes_select2_js', WPES_ASSETS_URL . 'js/select2.min.js' );
             wp_enqueue_script( 'wpes_admin_js', WPES_ASSETS_URL . 'js/wp-es-admin.js', array( 'jquery-ui-datepicker', 'wpes_select2_js' ) );
             wp_enqueue_style( 'wpes_jquery_ui', WPES_ASSETS_URL . 'css/jQueryUI/jquery-ui.min.css' );
             wp_enqueue_style( 'wpes_jquery_ui_theme', WPES_ASSETS_URL . 'css/jQueryUI/jquery-ui.theme.min.css' );
-            wp_enqueue_style( 'wpes_select2_css', 'https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css' );
+            wp_enqueue_style( 'wpes_select2_css', WPES_ASSETS_URL . 'css/select2.min.css' );
             wp_enqueue_style( 'wpes_admin_css', WPES_ASSETS_URL . 'css/wp-es-admin.css', array( 'wpes_jquery_ui', 'wpes_jquery_ui_theme', 'wpes_select2_css' ) );
 

wp-extended-search/trunk/includes/class-wpes-core.php

@@ -267 +267 @@
         add_action( 'pre_get_posts', array( $this, 'wp_es_pre_get_posts' ), 500 );
 
+        // Add additional hooks for compatibility with core and plugins/themes.
+        $this->add_additional_compatibility_hooks();
+
         // Call the init function so wpes_enabled filter can work.
         if ( ! empty( $this->wpes_wc ) ) {
@@ -464 +467 @@
 
         // Request distinct results.
-        add_filter( 'posts_distinct_request', array( $this, 'wp_es_distinct' ) );
+        add_filter(
+            'posts_distinct_request',
+            function() {
+                return 'DISTINCT';
+            }
+        );
 
         /**
@@ -499 +507 @@
         }
 
-        // Joint the users table.
+        // Join the users table.
         if ( ! empty( $this->wpes_settings['authors'] ) ) {
             $join .= " LEFT JOIN $wpdb->users esusers ON ($wpdb->posts.post_author = esusers.ID) ";
@@ -505 +513 @@
 
         return $join;
-    }
-
-    /**
-     * Request distinct results.
-     *
-     * @since 1.0
-     * @param string $distinct DISTINCT Keyword.
-     * @return string $distinct
-     */
-    public function wp_es_distinct( $distinct ) {
-        $distinct = 'DISTINCT';
-        return $distinct;
     }
 
@@ -604 +600 @@
         return false;
     }
+
+    /**
+     * Add additional hooks for compatibility with core and plugins/themes.
+     *
+     * @since dev
+     * @return void
+     */
+    public function add_additional_compatibility_hooks() {
+        // Disable WPES for Query Loop block when "Inherit query from template" is disabled.
+        add_action(
+            'query_loop_block_query_vars',
+            function( $query, $block ) {
+                if ( empty( $block->context['query']['inherit'] ) ) {
+                    $query['disable_wpes'] = true;
+                }
+
+                return $query;
+            },
+            10,
+            2
+        );
+    }
 }

wp-extended-search/trunk/languages/wp-extended-search.pot

@@ -6 +6 @@
 "Report-Msgid-Bugs-To: "
 "https://wordpress.org/support/plugin/wp-extended-search\n"
-"POT-Creation-Date: 2024-04-12 21:24:52+00:00\n"
+"POT-Creation-Date: 2024-06-17 19:16:43+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"