X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=actions%2Feditgroup.php;h=e46b1481d0d2ae717e933100aa56d94e3e73b460;hb=f4e17c1bdf42643c2bb530228f88809147992e9d;hp=f5bada04fc074e7162a7cb8ad1eebc997b83de8b;hpb=0bec9cfdbc8edb05677ad9997058265dd32921b4;p=quix0rs-gnu-social.git

diff --git a/actions/editgroup.php b/actions/editgroup.php
index f5bada04fc..e46b1481d0 100644
--- a/actions/editgroup.php
+++ b/actions/editgroup.php
@@ -185,7 +185,15 @@ class EditgroupAction extends GroupDesignAction
             $description = $this->trimmed('description');
             $location    = $this->trimmed('location');
             $aliasstring = $this->trimmed('aliases');
-            $join_policy = intval($this->arg('join_policy'));
+            $private     = $this->boolean('private');
+
+            if ($private) {
+                $force_scope = 1;
+                $join_policy = User_group::JOIN_POLICY_MODERATE;
+            } else {
+                $force_scope = 0;
+                $join_policy = User_group::JOIN_POLICY_OPEN;
+            }
 
             if ($this->nicknameExists($nickname)) {
                 // TRANS: Group edit form validation error.
@@ -267,6 +275,7 @@ class EditgroupAction extends GroupDesignAction
             $this->group->location    = $location;
             $this->group->mainpage    = common_local_url('showgroup', array('nickname' => $nickname));
             $this->group->join_policy = $join_policy;
+            $this->group->force_scope = $force_scope;
 
             $result = $this->group->update($orig);