diff --git a/plugins/ExtendedProfile/extendedprofile.php b/plugins/ExtendedProfile/extendedprofile.php index 43f5b55b9c..5ad6db114f 100644 --- a/plugins/ExtendedProfile/extendedprofile.php +++ b/plugins/ExtendedProfile/extendedprofile.php @@ -26,6 +26,8 @@ if (!defined('STATUSNET')) { */ class ExtendedProfile { + protected $fields; + /** * Constructor * @@ -82,12 +84,13 @@ class ExtendedProfile */ function getTextValue($name) { + $key = strtolower($name); $profileFields = array('fullname', 'location', 'bio'); - if (in_array(strtolower($name), $profileFields)) { + if (in_array($key, $profileFields)) { return $this->profile->$name; - } else if (in_array($name, $this->fields)) { - return $this->fields[$name]->field_value; + } else if (array_key_exists($key, $this->fields)) { + return $this->fields[$key][0]->field_value; } else { return null; } diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php index 1f2be5a060..7c68216972 100644 --- a/plugins/ExtendedProfile/profiledetailsettingsaction.php +++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php @@ -74,7 +74,11 @@ class ProfileDetailSettingsAction extends SettingsAction $cur = common_current_user(); $profile = $cur->getProfile(); - $widget = new ExtendedProfileWidget($this, $profile, ExtendedProfileWidget::EDITABLE); + $widget = new ExtendedProfileWidget( + $this, + $profile, + ExtendedProfileWidget::EDITABLE + ); $widget->show(); } @@ -154,8 +158,6 @@ class ProfileDetailSettingsAction extends SettingsAction */ function saveStandardProfileDetails($user) { - $user->query('BEGIN'); - $fullname = $this->trimmed('extprofile-fullname'); $location = $this->trimmed('extprofile-location'); $tagstring = $this->trimmed('extprofile-tags'); @@ -187,7 +189,7 @@ class ProfileDetailSettingsAction extends SettingsAction || $location != $profile->location || !empty($newTags) || $bio != $profile->bio) { - + $orig = clone($profile); $profile->nickname = $user->nickname; @@ -229,7 +231,6 @@ class ProfileDetailSettingsAction extends SettingsAction return; } - $user->query('COMMIT'); Event::handle('EndProfileSaveForm', array($this)); common_broadcast_profile($profile); }