Changeset 6415 for trunk/src/includes/extend/buddypress/functions.php

Timestamp:

05/19/2017 03:25:37 AM (7 years ago)

Author:

johnjamesjacoby

Message:

in_array(): be strict whenever possible.

Use wp_parse_id_list() on certain array values to ensure proper results.

File:

• trunk/src/includes/extend/buddypress/functions.php (modified) (10 diffs)

trunk/src/includes/extend/buddypress/functions.php

@@ -341 +341 @@
     }
 
-    // Make sure result is an array
-    if ( ! is_array( $forum_ids ) ) {
-        $forum_ids = (array) $forum_ids;
-    }
-
-    // Trim out any empty array items
-    $forum_ids = array_filter( $forum_ids );
-
+    // Make sure result is an array of ints
+    $forum_ids = array_filter( wp_parse_id_list( $forum_ids ) );
+
+    // Filter & return
     return (array) apply_filters( 'bbp_get_group_forum_ids', $forum_ids, $group_id );
 }
@@ -373 +369 @@
     }
 
-    // Make sure result is an array
-    if ( ! is_array( $group_ids ) ) {
-        $group_ids = (array) $group_ids;
-    }
-
-    // Trim out any empty array items
-    $group_ids = array_filter( $group_ids );
-
+    // Make sure result is an array of ints
+    $group_ids = array_filter( wp_parse_id_list( $group_ids ) );
+
+    // Filter & return
     return (array) apply_filters( 'bbp_get_forum_group_ids', $group_ids, $forum_id );
 }
@@ -398 +390 @@
 
     // Trim out any empties
-    $forum_ids = array_filter( $forum_ids );
+    $forum_ids = array_filter( wp_parse_id_list( $forum_ids ) );
 
     // Get the forums
@@ -414 +406 @@
 
     // Trim out any empties
-    $group_ids = array_filter( $group_ids );
+    $group_ids = array_filter( wp_parse_id_list( $group_ids ) );
 
     // Get the forums
@@ -440 +432 @@
 
     // Maybe update the groups forums
-    if ( ! in_array( $group_id, $group_ids ) ) {
+    if ( ! in_array( $group_id, $group_ids, true ) ) {
         $group_ids[] = $group_id;
         return bbp_update_forum_group_ids( $forum_id, $group_ids );
@@ -466 +458 @@
 
     // Maybe update the groups forums
-    if ( ! in_array( $forum_id, $forum_ids ) ) {
+    if ( ! in_array( $forum_id, $forum_ids, true ) ) {
         $forum_ids[] = $forum_id;
         return bbp_update_group_forum_ids( $group_id, $forum_ids );
@@ -492 +484 @@
 
     // Maybe update the groups forums
-    if ( in_array( $group_id, $group_ids ) ) {
+    if ( in_array( $group_id, $group_ids, true ) ) {
         $group_ids = array_diff( array_values( $group_ids ), (array) $group_id );
         return bbp_update_forum_group_ids( $forum_id, $group_ids );
@@ -518 +510 @@
 
     // Maybe update the groups forums
-    if ( in_array( $forum_id, $forum_ids ) ) {
+    if ( in_array( $forum_id, $forum_ids, true ) ) {
         $forum_ids = array_diff( array_values( $forum_ids ), (array) $forum_id );
         return bbp_update_group_forum_ids( $group_id, $forum_ids );
@@ -541 +533 @@
 
     // Loop through forums and remove this group from each one
-    foreach ( (array) $forum_ids as $forum_id ) {
+    foreach ( $forum_ids as $forum_id ) {
         bbp_remove_group_id_from_forum( $group_id, $forum_id );
     }
@@ -559 +551 @@
 
     // Loop through groups and remove this forum from each one
-    foreach ( (array) $group_ids as $group_id ) {
+    foreach ( $group_ids as $group_id ) {
         bbp_remove_forum_id_from_group( $forum_id, $group_id );
     }