Changeset 3241

Timestamp:

05/24/2016 10:38:16 PM (10 years ago)

Author:

coffee2code

Message:

developer.wordpress.org: Separate handbook search results from code reference search results.

Results reflect the context of the search, either the current handbook or the code reference.

Props keesiemeijer for initial patch.
See #1671.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/search.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/search.php

@@ -42 +42 @@
                 $query->set( 'order', 'ASC' );
 
-                // If user has '()' at end of a search string, assume they want a specific function/method.
-                $s = htmlentities( $query->get( 's' ) );
-                if ( '()' === substr( $s, -2 ) ) {
-                        // Enable exact search.
-                        $query->set( 'exact',     true );
-                        // Modify the search query to omit the parentheses.
-                        $query->set( 's',         substr( $s, 0, -2 ) ); // remove '()'
-                        // Restrict search to function-like content.
-                        $query->set( 'post_type', array( 'wp-parser-function', 'wp-parser-method' ) );
+                // Separates searches for handbook pages from non-handbook pages depending on
+                // whether the search was performed within context of a handbook page or not.
+                if ( wporg_is_handbook() ) {
+                        // Search only in current handbook post type.
+                        // Just to make sure. post type should already be set.
+                        $query->set( 'post_type', wporg_get_current_handbook() );
+                } else {
+                        // If user has '()' at end of a search string, assume they want a specific function/method.
+                        $s = htmlentities( $query->get( 's' ) );
+                        if ( '()' === substr( $s, -2 ) ) {
+                                // Enable exact search.
+                                $query->set( 'exact',     true );
+                                // Modify the search query to omit the parentheses.
+                                $query->set( 's',         substr( $s, 0, -2 ) ); // remove '()'
+                                // Restrict search to function-like content.
+                                $query->set( 'post_type', array( 'wp-parser-function', 'wp-parser-method' ) );
+                        } else {
+                                // Search parsed post types instead of all post types.
+                                $query->set( 'post_type', DevHub\get_parsed_post_types() );
+                        }
                 }
         }