Changeset 5096

Timestamp:

09/02/2011 11:21:15 AM (14 years ago)

Author:

boonebgorges

Message:

Get a fresh index each time through the loop when merging profile field data into the profile group array, to avoid errors when empty groups have been removed. Fixes #3542

File:

• trunk/bp-xprofile/bp-xprofile-classes.php (modified) (2 diffs)

trunk/bp-xprofile/bp-xprofile-classes.php

@@ -211 +211 @@
 
         // Merge the field array back in with the group array
-        foreach( (array) $groups as $group_key => $group ) {
+        foreach( (array) $groups as $group ) {
+
+            // Indexes may have been shifted after previous deletions, so we get a
+            // fresh one each time through the loop
+            $index = array_search( $group, $groups );
+
             foreach( (array) $fields as $field ) {
                 if ( $group->id == $field->group_id )
-                    $groups[$group_key]->fields[] = $field;
+                    $groups[$index]->fields[] = $field;
             }
 
@@ -220 +225 @@
             // Remove them, if necessary.
             if ( empty( $group->fields ) && $hide_empty_groups ) {
-                unset( $groups[$group_key] );
+                unset( $groups[$index] );
             }