From 38f977d2f3bc792a0468be3c4031839a15520139 Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Fri, 6 Mar 2015 23:21:57 +0100
Subject: [PATCH] Make sure we save 0 as '0' because of DB_DataObject bug
---
actions/profilesettings.php | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 59a7f6d860..8805527a9c 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -82,8 +82,8 @@ class ProfilesettingsAction extends SettingsAction
*/
function showContent()
{
- $user = common_current_user();
- $profile = $user->getProfile();
+ $profile = $this->scoped;
+ $user = $this->scoped->getUser();
$this->elementStart('form', array('method' => 'post',
'id' => 'form_settings_profile',
@@ -260,9 +260,9 @@ class ProfilesettingsAction extends SettingsAction
$homepage = $this->trimmed('homepage');
$bio = $this->trimmed('bio');
$location = $this->trimmed('location');
- $autosubscribe = $this->boolean('autosubscribe');
+ $autosubscribe = $this->booleanintstring('autosubscribe');
$subscribe_policy = $this->trimmed('subscribe_policy');
- $private_stream = $this->boolean('private_stream');
+ $private_stream = $this->booleanintstring('private_stream');
$language = $this->trimmed('language');
$timezone = $this->trimmed('timezone');
$tagstring = $this->trimmed('tags');
@@ -398,7 +398,7 @@ class ProfilesettingsAction extends SettingsAction
$orig = clone($prefs);
}
- $prefs->share_location = $this->boolean('sharelocation');
+ $prefs->share_location = $this->booleanintstring('sharelocation');
if ($exists) {
$result = $prefs->update($orig);