Changeset 2576 for trunk/bp-core.php

Timestamp:

02/03/2010 09:06:27 PM (17 years ago)

Author:

apeatling

Message:

Fixes #1551 - also safeguarded all foreach loops with an array typecast.

File:

• trunk/bp-core.php (modified) (6 diffs)

trunk/bp-core.php

@@ -730 +730 @@
                 return false;
 
-        foreach ( $bp->bp_nav as $slug => $nav_item ) {
+        foreach ( (array)$bp->bp_nav as $slug => $nav_item ) {
                 if ( empty( $temp[$nav_item['position']]) )
                         $temp[$nav_item['position']] = $nav_item;
@@ -809 +809 @@
                 return false;
 
-        foreach ( $bp->bp_options_nav as $parent_slug => $subnav_items ) {
+        foreach ( (array)$bp->bp_options_nav as $parent_slug => $subnav_items ) {
                 if ( !is_array( $subnav_items ) )
                         continue;
 
-                foreach ( $subnav_items as $subnav_item ) {
+                foreach ( (array)$subnav_items as $subnav_item ) {
                         if ( empty( $temp[$subnav_item['position']]) )
                                 $temp[$subnav_item['position']] = $subnav_item;
@@ -847 +847 @@
         /* Unset subnav items for this nav item */
         if ( is_array( $bp->bp_options_nav[$parent_id] ) ) {
-                foreach( $bp->bp_options_nav[$parent_id] as $subnav_item ) {
+                foreach( (array)$bp->bp_options_nav[$parent_id] as $subnav_item ) {
                         bp_core_remove_subnav_item( $parent_id, $subnav_item['slug'] );
                 }
@@ -1582 +1582 @@
 
         if ( is_array( $current ) ) {
-                foreach( $bp_illegal_names as $bp_illegal_name ) {
+                foreach( (array)$bp_illegal_names as $bp_illegal_name ) {
                         if ( !in_array( $bp_illegal_name, $current ) )
                                 $current[] = $bp_illegal_name;
@@ -2007 +2007 @@
         global $wpdb;
 
-        foreach( $comments as $comment ) {
+        foreach( (array)$comments as $comment ) {
                 if ( $comment->user_id )
                         $user_ids[] = $comment->user_id;
@@ -2020 +2020 @@
                 return $comments;
 
-        foreach( $userdata as $user )
+        foreach( (array)$userdata as $user )
                 $users[$user->user_id] = bp_core_get_user_domain( $user->user_id, $user->user_nicename, $user->user_login );
 
-        foreach( $comments as $i => $comment ) {
+        foreach( (array)$comments as $i => $comment ) {
                 if ( !empty( $comment->user_id ) ) {
                         if ( !empty( $users[$comment->user_id] ) )