Changeset 4093 for trunk/bp-members/bp-members-template.php

Timestamp:

03/10/2011 06:34:48 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Remove superfluous isset check on $_REQUEST, and clean up $max check in bp_has_members()

File:

• trunk/bp-members/bp-members-template.php (modified) (2 diffs)

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

@@ -276 +276 @@
     // Pass a filter if ?s= is set.
     if ( is_null( $search_terms ) ) {
-        if ( isset( $_REQUEST['s'] ) && !empty( $_REQUEST['s'] ) )
+        if ( !empty( $_REQUEST['s'] ) )
             $search_terms = $_REQUEST['s'];
         else
@@ -282 +282 @@
     }
 
-    if ( $max ) {
-        if ( $per_page > $max )
-            $per_page = $max;
-    }
+    // Set per_page to max if max is larger than per_page
+    if ( !empty( $max ) && ( $per_page > $max ) )
+        $per_page = $max;
 
     // Make sure we return no members if we looking at friendship requests and there are none.