Changeset 10407

Timestamp:

12/14/2015 03:20:30 AM (9 years ago)

Author:

r-a-y

Message:

Use component search parameter instead of hardcoded 's' parameter.

This commit primarily fixes issues with extended profile links using the
older 's' parameter instead of the newer members search query argument.
See #5087.

Props kennibc.

See #6770 (trunk).

Location:

trunk/src

Files:

• bp-groups/bp-groups-template.php (modified) (1 diff)
• bp-members/bp-members-template.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-filters.php (modified) (1 diff)

trunk/src/bp-groups/bp-groups-template.php

@@ -3663 +3663 @@
  */
 function bp_group_hidden_fields() {
-    if ( isset( $_REQUEST['s'] ) ) {
-        echo '<input type="hidden" id="search_terms" value="' . esc_attr( $_REQUEST['s'] ) . '" name="search_terms" />';
+    $query_arg = bp_core_get_component_search_query_arg( 'groups' );
+
+    if ( isset( $_REQUEST[ $query_arg ] ) ) {
+        echo '<input type="hidden" id="search_terms" value="' . esc_attr( $_REQUEST[ $query_arg ] ) . '" name="search_terms" />';
     }
 

trunk/src/bp-members/bp-members-template.php

@@ -1314 +1314 @@
  */
 function bp_member_hidden_fields() {
-    if ( isset( $_REQUEST['s'] ) )
-        echo '<input type="hidden" id="search_terms" value="' . esc_attr( $_REQUEST['s'] ) . '" name="search_terms" />';
-
-    if ( isset( $_REQUEST['letter'] ) )
+    $query_arg = bp_core_get_component_search_query_arg( 'members' );
+
+    if ( isset( $_REQUEST[ $query_arg ] ) ) {
+        echo '<input type="hidden" id="search_terms" value="' . esc_attr( $_REQUEST[ $query_arg ] ) . '" name="search_terms" />';
+    }
+
+    if ( isset( $_REQUEST['letter'] ) ) {
         echo '<input type="hidden" id="selected_letter" value="' . esc_attr( $_REQUEST['letter'] ) . '" name="selected_letter" />';
-
-    if ( isset( $_REQUEST['members_search'] ) )
+    }
+
+    if ( isset( $_REQUEST['members_search'] ) ) {
         echo '<input type="hidden" id="search_terms" value="' . esc_attr( $_REQUEST['members_search'] ) . '" name="search_terms" />';
+    }
 }
 

trunk/src/bp-xprofile/bp-xprofile-filters.php

@@ -368 +368 @@
                 // Less than 5 spaces.
                 } else {
-                    $search_url   = add_query_arg( array( 's' => urlencode( $value ) ), bp_get_members_directory_permalink() );
+                    $query_arg    = bp_core_get_component_search_query_arg( 'members' );
+                    $search_url   = add_query_arg( array( $query_arg => urlencode( $value ) ), bp_get_members_directory_permalink() );
                     $new_values[] = '<a href="' . esc_url( $search_url ) . '" rel="nofollow">' . $value . '</a>';
                 }