Changeset 5906

Timestamp:

03/11/2012 04:39:44 PM (13 years ago)

Author:

boonebgorges

Message:

Reworks some functions around the querying of friendship requests:

• Refactors bp_get_friendship_requests() so that it accepts a manual user_id parameter, and so that it falls back on the displayed_user rather than the loggedin_user (for future administrative tasks)
• Reconfigures the return value of bp_get_friendship_requests() so that a 0 is returned when there are no pending requests, to ensure that a non-false value is passed to bp_has_members() when viewing the Requests page of a user with no pending requests
• Removes the hardcoded 'return false' from bp_has_members() that would occur when an empty 'include' parameter was passed on the Requests page, so that sidebar widgets using bp_has_members() would work properly
• Reconfigures the 'include' logic in BP_Core_User::get_users() so that a value of 0 or '0' results in a false result, while continuing to respect legacy behavior of the default false value
• Fixes #4066

Location:

trunk

Files:

• bp-core/bp-core-classes.php (modified) (1 diff)
• bp-friends/bp-friends-template.php (modified) (1 diff)
• bp-members/bp-members-template.php (modified) (1 diff)

trunk/bp-core/bp-core-classes.php

@@ -256 +256 @@
         }
 
-        if ( !empty( $include ) ) {
-            if ( is_array( $include ) ) {
-                $uids = $wpdb->escape( implode( ',', (array) $include ) );
-            } else {
-                $uids = $wpdb->escape( $include );
-            }
-
-            if ( !empty( $uids ) ) {
-                $sql['where_users'] = "AND u.ID IN ({$uids})";
-            }
-        } elseif ( !empty( $user_id ) && bp_is_active( 'friends' ) ) {
-            $friend_ids = friends_get_friend_user_ids( $user_id );
-            $friend_ids = $wpdb->escape( implode( ',', (array) $friend_ids ) );
-
-            if ( !empty( $friend_ids ) ) {
-                $sql['where_friends'] = "AND u.ID IN ({$friend_ids})";
-
-            // User has no friends, return false since there will be no users to fetch.
-            } else {
-                return false;
+        // Passing an $include value of 0 or '0' will necessarily result in an empty set
+        // returned. The default value of false will hit the 'else' clause.
+        if ( 0 === $include || '0' === $include ) {
+            $sql['where_users'] = "AND 0 = 1";
+        } else {
+            if ( !empty( $include ) ) {
+                if ( is_array( $include ) ) {
+                    $uids = $wpdb->escape( implode( ',', (array) $include ) );
+                } else {
+                    $uids = $wpdb->escape( $include );
+                }
+    
+                if ( !empty( $uids ) ) {
+                    $sql['where_users'] = "AND u.ID IN ({$uids})";
+                }
+            } elseif ( !empty( $user_id ) && bp_is_active( 'friends' ) ) {
+                $friend_ids = friends_get_friend_user_ids( $user_id );
+                $friend_ids = $wpdb->escape( implode( ',', (array) $friend_ids ) );
+    
+                if ( !empty( $friend_ids ) ) {
+                    $sql['where_friends'] = "AND u.ID IN ({$friend_ids})";
+    
+                // User has no friends, return false since there will be no users to fetch.
+                } else {
+                    return false;
+                }
             }
         }

trunk/bp-friends/bp-friends-template.php

@@ -379 +379 @@
     return implode( ',', friends_get_friend_user_ids( $user_id ) );
 }
-function bp_get_friendship_requests() {
-    return apply_filters( 'bp_get_friendship_requests', implode( ',', (array) friends_get_friendship_request_user_ids( bp_loggedin_user_id() ) ) );
+
+/**
+ * Get a user's friendship requests
+ *
+ * Note that we return a 0 if no pending requests are found. This is necessary because of the
+ * structure of the $include parameter in bp_has_members().
+ *
+ * @param int $user_id Defaults to displayed user
+ * @return mixed Returns an array of users if found, or a 0 if none are found
+ */
+function bp_get_friendship_requests( $user_id = 0 ) {
+    if ( !$user_id ) {
+        $user_id = bp_displayed_user_id();
+    }
+    
+    if ( !$user_id ) {
+        return 0;   
+    }
+    
+    $requests = friends_get_friendship_request_user_ids( $user_id );
+    
+    if ( !empty( $requests ) ) {
+        $requests = implode( ',', (array) $requests );
+    } else {
+        $requests = 0;
+    }
+    
+    return apply_filters( 'bp_get_friendship_requests', $requests );
 }
 

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

@@ -314 +314 @@
     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.
-    if ( empty( $include ) && bp_is_friends_component() && bp_is_current_action( 'requests' ) )
-        return false;
 
     $members_template = new BP_Core_Members_Template( $type, $page, $per_page, $max, $user_id, $search_terms, $include, (bool)$populate_extras, $exclude, $meta_key, $meta_value, $page_arg );