Changeset 9363

Timestamp:

12/19/2019 08:03:44 AM (5 years ago)

Author:

dd32

Message:

Theme Directory: Prioritise exact-match theme searches in search results, and allow an exact-match slug/title to bypass the last two years restriction.

Fixes #2939, #4920.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory

Files:

• class-themes-api.php (modified) (2 diffs)
• query-modifications.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-themes-api.php

@@ -450 +450 @@
         $cache_key = sanitize_key( __METHOD__ . ':' . get_locale() . ':' . md5( serialize( $this->request ) . serialize( $this->fields ) ) );
         if ( false !== ( $this->response = wp_cache_get( $cache_key, $this->cache_group ) ) && empty( $this->request->cache_buster ) ) {
-            return;
+        //  return;
         }
 
@@ -487 +487 @@
         }
 
-        wp_cache_set( $cache_key, $this->response, $this->cache_group, $this->cache_life );
+        //wp_cache_set( $cache_key, $this->response, $this->cache_group, $this->cache_life );
     }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/query-modifications.php

@@ -136 +136 @@
         ! in_array( $query->query_vars['browse'], array( 'favorites', 'new', 'updated' ) )
     ) {
-        add_filter( 'posts_clauses', 'wporg_themes_prioritize_translated_posts_clauses' );
-    }
-
+        add_filter( 'posts_clauses', 'wporg_themes_prioritize_translated_posts_clauses', 11 );
+    }
+
+    if ( $query->is_search() ) {
+        add_filter( 'posts_clauses', 'wporg_themes_prioritize_exact_matches_clauses', 10, 2 );
+    }
 }
 add_action( 'pre_get_posts', 'wporg_themes_pre_get_posts' );
@@ -160 +163 @@
 
 /**
+ * Filters SQL clauses, to prioritise exact theme slug matches.
+ */
+function wporg_themes_prioritize_exact_matches_clauses( $clauses, $query ) {
+    global $wpdb;
+
+    // Override the post_modified check to allow matching when an exact title/slug match is found.
+    $clauses['where'] = preg_replace_callback(
+        "!{$wpdb->posts}.post_modified > '(.+?)'!is",
+        function( $m ) use ( $query ) {
+            global $wpdb;
+
+            return $wpdb->prepare(
+                "( {$wpdb->posts}.post_modified > %s OR {$wpdb->posts}.post_name = %s OR {$wpdb->posts}.post_title = %s )",
+                $m[1],
+                $query->get('s'),
+                $query->get('s')
+            );
+        },
+        $clauses['where']
+    );
+
+    // Prioritize exact-match slug/titles in search results
+    $clauses['orderby'] = $wpdb->prepare(
+        "( {$wpdb->posts}.post_name = %s OR {$wpdb->posts}.post_title = %s ) DESC, ",
+        $query->get( 's' ),
+        $query->get( 's' )
+    ) . $clauses['orderby'];
+
+    return $clauses;
+}
+
+/**
  * Handle proper 404 errors for requests.
  */