Changeset 7076

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.

Location:

trunk/src/includes

Files:

• common/shortcodes.php (modified) (2 diffs)
• common/template.php (modified) (2 diffs)
• core/template-functions.php (modified) (5 diffs)
• search/template.php (modified) (1 diff)

trunk/src/includes/common/shortcodes.php

@@ -672 +672 @@
 
         // Set passed attribute to $search_terms for clarity
-        $search_terms = empty( $attr['search'] ) ? bbp_get_search_terms() : $attr['search'];
+        $search_terms = empty( $attr['search'] )
+            ? bbp_get_search_terms()
+            : $attr['search'];
+
+        // Get the rewrite ID (one time, to avoid repeated calls)
+        $rewrite_id = bbp_get_search_rewrite_id();
 
         // Unset globals
@@ -678 +683 @@
 
         // Set terms for query
-        set_query_var( bbp_get_search_rewrite_id(), $search_terms );
-
-        // Start output buffer
-        $this->start( bbp_get_search_rewrite_id() );
+        set_query_var( $rewrite_id, $search_terms );
+
+        // Start output buffer
+        $this->start( $rewrite_id );
 
         // Output template

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;
     }

trunk/src/includes/core/template-functions.php

@@ -536 +536 @@
     }
 
-    // Get query variables
-    $bbp_view = $posts_query->get( bbp_get_view_rewrite_id() );
-    $bbp_user = $posts_query->get( bbp_get_user_rewrite_id() );
-    $is_edit  = $posts_query->get( bbp_get_edit_rewrite_id() );
+    // Get query variables (default to null if not set)
+    $bbp_view  = $posts_query->get( bbp_get_view_rewrite_id(),   null );
+    $bbp_user  = $posts_query->get( bbp_get_user_rewrite_id(),   null );
+    $is_edit   = $posts_query->get( bbp_get_edit_rewrite_id(),   null );
+    $is_search = $posts_query->get( bbp_get_search_rewrite_id(), null );
 
     // It is a user page - We'll also check if it is user edit
-    if ( ! empty( $bbp_user ) ) {
+    if ( ! is_null( $bbp_user ) ) {
 
         /** Find User *********************************************************/
@@ -573 +574 @@
 
         // View or edit?
-        if ( ! empty( $is_edit ) ) {
+        if ( ! is_null( $is_edit ) ) {
 
             // We are editing a profile
@@ -645 +646 @@
 
     // View Page
-    } elseif ( ! empty( $bbp_view ) ) {
+    } elseif ( ! is_null( $bbp_view ) ) {
 
         // Check if the view exists by checking if there are query args are set
@@ -666 +667 @@
 
     // Search Page
-    } elseif ( isset( $posts_query->query_vars[ bbp_get_search_rewrite_id() ] ) ) {
+    } elseif ( ! is_null( $is_search ) ) {
 
         // Check if there are search query args set
@@ -684 +685 @@
 
     // Forum/Topic/Reply Edit Page
-    } elseif ( ! empty( $is_edit ) ) {
+    } elseif ( ! is_null( $is_edit ) ) {
 
         // Get the post type from the main query loop

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