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

Timestamp:

04/05/2020 07:21:41 PM (6 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/common/template.php (modified) (2 diffs)

trunk/src/includes/common/template.php

@@ -871 +871 @@
     $wp_query = bbp_get_wp_query();
 
+    // Get the rewrite ID (one time, to avoid repeated calls)
+    $rewrite_id = bbp_get_search_rewrite_id();
+
     // Check query
     if ( ! empty( $wp_query->bbp_is_search ) && ( true === $wp_query->bbp_is_search ) ) {
@@ -877 +880 @@
 
     // Check query name
-    if ( empty( $retval ) && bbp_is_query_name( bbp_get_search_rewrite_id() ) ) {
+    if ( empty( $retval ) && bbp_is_query_name( $rewrite_id ) ) {
         $retval = true;
     }
 
     // Check $_GET
-    if ( empty( $retval ) && isset( $_REQUEST[ bbp_get_search_rewrite_id() ] ) && empty( $_REQUEST[ bbp_get_search_rewrite_id() ] ) ) {
+    if ( empty( $retval ) && isset( $_REQUEST[ $rewrite_id ] ) && empty( $_REQUEST[ $rewrite_id ] ) ) {
         $retval = true;
     }