Changeset 3390

Timestamp:

11/11/2010 06:22:55 AM (16 years ago)

Author:

johnjamesjacoby

Message:

Fixes #2685 by reverting part of r3270 (branch)

Location:

branches/1.2/bp-xprofile

Files:

• bp-xprofile-classes.php (modified) (1 diff)
• bp-xprofile-templatetags.php (modified) (1 diff)

branches/1.2/bp-xprofile/bp-xprofile-classes.php

@@ -813 +813 @@
                 }
 
-                return maybe_unserialize( $data );
+                return $data;
         }
 

branches/1.2/bp-xprofile/bp-xprofile-templatetags.php

@@ -377 +377 @@
 
                                 for ( $k = 0; $k < count($options); $k++ ) {
-                                        $option_values = BP_XProfile_ProfileData::get_value_byid( $options[$k]->parent_id );
+                                        $option_values = maybe_unserialize( BP_XProfile_ProfileData::get_value_byid( $options[$k]->parent_id ) );
                                         $option_values = (array)$option_values;