X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fprofilesettings.php;h=7d3143d4b186507483af83288750c910a220d45e;hb=fd2efbc6f81aba67ff3776712af65b1a8fa73d06;hp=59a7f6d8604895933ac1dfd6e7db423beabaf1d2;hpb=fb9d32a8afdabd2a094f25fbba9c937bc9f0e7c5;p=quix0rs-gnu-social.git

diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 59a7f6d860..7d3143d4b1 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',
@@ -104,7 +104,9 @@ class ProfilesettingsAction extends SettingsAction
                          // TRANS: Tooltip for field label in form for profile settings.
                          _('1-64 lowercase letters or numbers, no punctuation or spaces.'),
                          null, false,   // "name" (will be set to id), then "required"
-                         !common_config('profile', 'changenick') ? array('disabled'=>'disabled') : array());
+                         !common_config('profile', 'changenick')
+                                        ? array('disabled' => 'disabled', 'placeholder' => null)
+                                        : array('placeholder' => null));
             $this->elementEnd('li');
             $this->elementStart('li');
             // TRANS: Field label in form for profile settings.
@@ -260,9 +262,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 +400,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);