Changeset 7076 for trunk/src/includes/search/template.php

Timestamp:

04/05/2020 07:21:41 PM (5 years ago)

Author:

johnjamesjacoby

Message:

Search/Rewrites: unslash search terms inside bbp_get_search_terms().

This commit ensures that search terms appear correctly inside of template output, without additional slashes.

It also eliminates a few repeated calls to bbp_get_search_rewrite_id(), and more strictly compares rewrite rule query vars to null results for improved code clarity & consistency.

Props dd32, johnjamesjacoby.

See #3357. Trunk, for 2.7.0.

File:

• trunk/src/includes/search/template.php (modified) (1 diff)

trunk/src/includes/search/template.php

@@ -298 +298 @@
 
             // Global
-            if ( get_query_var( bbp_get_search_rewrite_id() ) ) {
-                $search_terms = get_query_var( bbp_get_search_rewrite_id() );
+            $search_terms = get_query_var( bbp_get_search_rewrite_id(), null );
+
+            // Searching globally
+            if ( ! is_null( $search_terms )  ) {
+                $search_terms = wp_unslash( $search_terms );
 
             // Other searches