Changeset 11609

Timestamp:

06/23/2017 01:39:31 PM (8 years ago)

Author:

dcavins

Message:

Handle missing parameter in group admin fetching functions.

In some situations, bp_group_has_moderators() is
being called without a $group parameter, causing the
downstream functions problems. This commit adds an
early return if the required parameter isn’t supplied.
It also recognizes when the cache request returns false
and skips the integer casting step.

Fixes #7524.

Location:

trunk

Files:

• src/bp-groups/classes/class-bp-groups-member.php (modified) (4 diffs)
• tests/phpunit/testcases/groups/class-bp-groups-member.php (modified) (1 diff)

trunk/src/bp-groups/classes/class-bp-groups-member.php

@@ -1089 +1089 @@
         global $wpdb;
 
+        if ( empty( $group_id ) ) {
+            return array();
+        }
+
         $group_admins = wp_cache_get( $group_id, 'bp_group_admins' );
 
@@ -1096 +1100 @@
         }
 
-        // Integer casting.
-        foreach ( (array) $group_admins as $key => $data ) {
-            $group_admins[ $key ]->user_id = (int) $group_admins[ $key ]->user_id;
+        if ( false === $group_admins ) {
+            // The wp_cache_get is still coming up empty. Return an empty array.
+            $group_admins = array();
+        } else {
+            // Cast the user_id property as an integer.
+            foreach ( (array) $group_admins as $key => $data ) {
+                $group_admins[ $key ]->user_id = (int) $group_admins[ $key ]->user_id;
+            }
         }
 
@@ -1159 +1168 @@
         global $wpdb;
 
+        if ( empty( $group_id ) ) {
+            return array();
+        }
+
         $group_mods = wp_cache_get( $group_id, 'bp_group_mods' );
 
@@ -1166 +1179 @@
         }
 
-        // Integer casting.
-        foreach ( (array) $group_mods as $key => $data ) {
-            $group_mods[ $key ]->user_id = (int) $group_mods[ $key ]->user_id;
+        if ( false === $group_mods ) {
+            // The wp_cache_get is still coming up empty. Return an empty array.
+            $group_mods = array();
+        } else {
+            // Cast the user_id property as an integer.
+            foreach ( (array) $group_mods as $key => $data ) {
+                $group_mods[ $key ]->user_id = (int) $group_mods[ $key ]->user_id;
+            }
         }
 

trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php

@@ -1354 +1354 @@
         $this->assertEquals( $user, $user_obj->id );
     }
+
+    /**
+     * @group get_group_moderator_ids
+     */
+    public function test_groups_get_group_mods_bad_id() {
+        $mods = groups_get_group_mods( null );
+
+        $this->assertTrue( is_array( $mods ) && empty( $mods ) );
+    }
+
+    /**
+     * @group get_group_moderator_ids
+     */
+    public function test_groups_get_group_admins_bad_id() {
+        $admins = groups_get_group_admins( null );
+
+        $this->assertTrue( is_array( $admins ) && empty( $admins ) );
+    }
 }