Skip to:
Content

Ticket #4267: 4267.diff

File 4267.diff, 3.1 KB (added by enderandrew, 22 months ago)

Here's a patch.

  • bp-members/bp-members-screens.php

    diff -uNr buddypress-original/bp-members/bp-members-screens.php buddypress/bp-members/bp-members-screens.php
    old new  
    6767                return; 
    6868        } 
    6969 
     70        $bp->signup = (object) $bp->signup; 
    7071        $bp->signup->step = 'request-details'; 
    7172 
    7273        if ( !bp_get_signup_allowed() ) { 
  • bp-themes/bp-default/_inc/ajax.php

    diff -uNr buddypress-original/bp-themes/bp-default/_inc/ajax.php buddypress/bp-themes/bp-default/_inc/ajax.php
    old new  
    326326        bp_has_activities( 'display_comments=stream&hide_spam=false&include=' . $comment_id ); 
    327327 
    328328        // Swap the current comment with the activity item we just loaded 
     329        $activities_template->activity = (object) $activities_template->activity; 
    329330        $activities_template->activity->id              = $activities_template->activities[0]->item_id; 
    330331        $activities_template->activity->current_comment = $activities_template->activities[0]; 
    331332 
  • bp-xprofile/bp-xprofile-classes.php

    diff -uNr buddypress-original/bp-xprofile/bp-xprofile-classes.php buddypress/bp-xprofile/bp-xprofile-classes.php
    old new  
    224224 
    225225                                                // Assign correct data value to the field 
    226226                                                if ( $field->id == $data->field_id ) { 
     227                                                        $fields[$field_key] = (object) $fields[$field_key]; 
    227228                                                        $fields[$field_key]->data->value = $data->value; 
    228229                                                        $fields[$field_key]->data->id = $data->id; 
    229230                                                } 
  • bp-xprofile/bp-xprofile-screens.php

    diff -uNr buddypress-original/bp-xprofile/bp-xprofile-screens.php buddypress/bp-xprofile/bp-xprofile-screens.php
    old new  
    154154                return; 
    155155        } 
    156156 
     157        $bp->avatar_admin = (object) $bp->avatar_admin; 
    157158        $bp->avatar_admin->step = 'upload-image'; 
    158159 
    159160        if ( !empty( $_FILES ) ) { 
  • bp-xprofile/bp-xprofile-template.php

    diff -uNr buddypress-original/bp-xprofile/bp-xprofile-template.php buddypress/bp-xprofile/bp-xprofile-template.php
    old new  
    325325        function bp_get_the_profile_field_value() { 
    326326                global $field; 
    327327 
     328                $field->data = (object) $field->data; 
    328329                $field->data->value = bp_unserialize_profile_field( $field->data->value ); 
    329330 
    330331                return apply_filters( 'bp_get_the_profile_field_value', $field->data->value, $field->type, $field->id ); 
     
    341342                 * value as long as it's not empty and a required field. 
    342343                 */ 
    343344                if ( !isset( $field->data->value ) ) 
     345                        $field->data = (object) $field->data; 
    344346                        $field->data->value = ''; 
    345347 
    346348                if ( isset( $_POST['field_' . $field->id] ) && $field->data->value != $_POST['field_' . $field->id] ) {