Changeset 7076 for trunk/src/includes/core/template-functions.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/core/template-functions.php (modified) (5 diffs)

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