Ticket #4267: 4267.diff

bp-members/bp-members-screens.php

@@ -67 +67 @@
                 return;
         }
 
+        $bp->signup = (object) $bp->signup;
         $bp->signup->step = 'request-details';
 
         if ( !bp_get_signup_allowed() ) {

bp-themes/bp-default/_inc/ajax.php

@@ -326 +326 @@
         bp_has_activities( 'display_comments=stream&hide_spam=false&include=' . $comment_id );
 
         // Swap the current comment with the activity item we just loaded
+        $activities_template->activity = (object) $activities_template->activity;
         $activities_template->activity->id              = $activities_template->activities[0]->item_id;
         $activities_template->activity->current_comment = $activities_template->activities[0];
 

bp-xprofile/bp-xprofile-classes.php

@@ -224 +224 @@
 
                                                 // Assign correct data value to the field
                                                 if ( $field->id == $data->field_id ) {
+                                                        $fields[$field_key] = (object) $fields[$field_key];
                                                         $fields[$field_key]->data->value = $data->value;
                                                         $fields[$field_key]->data->id = $data->id;
                                                 }

bp-xprofile/bp-xprofile-screens.php

@@ -154 +154 @@
                 return;
         }
 
+        $bp->avatar_admin = (object) $bp->avatar_admin;
         $bp->avatar_admin->step = 'upload-image';
 
         if ( !empty( $_FILES ) ) {

bp-xprofile/bp-xprofile-template.php

@@ -325 +325 @@
         function bp_get_the_profile_field_value() {
                 global $field;
 
+                $field->data = (object) $field->data;
                 $field->data->value = bp_unserialize_profile_field( $field->data->value );
 
                 return apply_filters( 'bp_get_the_profile_field_value', $field->data->value, $field->type, $field->id );
@@ -341 +342 @@
                  * value as long as it's not empty and a required field.
                  */
                 if ( !isset( $field->data->value ) )
+                        $field->data = (object) $field->data;
                         $field->data->value = '';
 
                 if ( isset( $_POST['field_' . $field->id] ) && $field->data->value != $_POST['field_' . $field->id] ) {