Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

[quix0rs-gnu-social.git] / actions / profilesettings.php

diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 1961f94e9ffb73cd20ad40ffbd1fd2d6ca6ad468..f380fe4d6dec275b476bd4b3879e8906972515e9 100644 (file)
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -203,6 +203,13 @@ class ProfilesettingsAction extends SettingsAction
                             (empty($user->subscribe_policy)) ? User::SUBSCRIBE_POLICY_OPEN : $user->subscribe_policy);
             $this->elementEnd('li');
         }
+        $this->elementStart('li');
+        $this->checkbox('private_stream',
+                        // TRANS: Checkbox label in profile settings.
+                        _('Make updates visible only to my followers'),
+                        ($this->arg('private_stream')) ?
+                        $this->boolean('private_stream') : $user->private_stream);
+        $this->elementEnd('li');
         $this->elementEnd('ul');
         // TRANS: Button to save input in profile settings.
         $this->submit('save', _m('BUTTON','Save'));
@@ -245,6 +252,7 @@ class ProfilesettingsAction extends SettingsAction
             $location = $this->trimmed('location');
             $autosubscribe = $this->boolean('autosubscribe');
             $subscribe_policy = $this->trimmed('subscribe_policy');
+            $private_stream = $this->boolean('private_stream');
             $language = $this->trimmed('language');
             $timezone = $this->trimmed('timezone');
             $tagstring = $this->trimmed('tags');
@@ -350,11 +358,14 @@ class ProfilesettingsAction extends SettingsAction
             }
 
             // XXX: XOR
-            if (($user->autosubscribe ^ $autosubscribe) || $user->subscribe_policy != $subscribe_policy) {
+            if (($user->autosubscribe ^ $autosubscribe) ||
+                ($user->private_stream ^ $private_stream) ||
+                ($user->subscribe_policy != $subscribe_policy)) {
 
                 $original = clone($user);
 
-                $user->autosubscribe = $autosubscribe;
+                $user->autosubscribe    = $autosubscribe;
+                $user->private_stream   = $private_stream;
                 $user->subscribe_policy = $subscribe_policy;
 
                 $result = $user->update($original);