Changeset 3092

Timestamp:

06/27/2010 06:40:48 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Fix #2116 props edelwater

File:

• branches/1.2/bp-core/bp-core-templatetags.php (modified) (2 diffs)

branches/1.2/bp-core/bp-core-templatetags.php

@@ -124 +124 @@
     $search_terms = false;
 
-    /* User filtering */
+    // User filtering
     if ( !empty( $bp->displayed_user->id ) )
         $user_id = $bp->displayed_user->id;
 
-    /* Pass a filter if ?s= is set. */
-    if ( $_REQUEST['s'] )
+    // Pass a filter if ?s= is set.
+    if ( isset( $_REQUEST['s'] ) && !empty( $_REQUEST['s'] ) )
         $search_terms = $_REQUEST['s'];
 
@@ -155 +155 @@
     }
 
-    /* Make sure we return no members if we looking at friendship requests and there are none. */
+    // Make sure we return no members if we looking at friendship requests and there are none.
     if ( empty( $include ) && $bp->friends->slug == $bp->current_component && 'requests' == $bp->current_action )
         return false;