X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fgroupdesignsettings.php;h=1c998efe1e215772beb8e96facbd4084341ab7ff;hb=185e229f7974c3bee2070ee7a2e4b8aaf01ee35e;hp=973c1b80264f45027d1bc145c3bf180d612b37b9;hpb=d35b2d3f3c2128b147a6fa897032262c1f632262;p=quix0rs-gnu-social.git

diff --git a/actions/groupdesignsettings.php b/actions/groupdesignsettings.php
index 973c1b8026..1c998efe1e 100644
--- a/actions/groupdesignsettings.php
+++ b/actions/groupdesignsettings.php
@@ -21,14 +21,14 @@
  *
  * @category  Settings
  * @package   StatusNet
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -41,8 +41,8 @@ require_once INSTALLDIR . '/lib/designsettings.php';
  *
  * @category Settings
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
@@ -64,11 +64,6 @@ class GroupDesignSettingsAction extends DesignSettingsAction
     {
         parent::prepare($args);
 
-        if (!common_config('inboxes', 'enabled')) {
-            $this->serverError(_('Inboxes must be enabled for groups to work'));
-            return false;
-        }
-
         if (!common_logged_in()) {
             $this->clientError(_('You must be logged in to edit a group.'));
             return false;
@@ -178,17 +173,12 @@ class GroupDesignSettingsAction extends DesignSettingsAction
 
     function getWorkingDesign()
     {
-
         $design = null;
 
         if (isset($this->group)) {
             $design = $this->group->getDesign();
         }
 
-        if (empty($design)) {
-            $design = $this->defaultDesign();
-        }
-
         return $design;
     }
 
@@ -202,7 +192,13 @@ class GroupDesignSettingsAction extends DesignSettingsAction
 
     function showContent()
     {
-        $this->showDesignForm($this->getWorkingDesign());
+        $design = $this->getWorkingDesign();
+
+        if (empty($design)) {
+            $design = Design::siteDesign();
+        }
+
+        $this->showDesignForm($design);
     }
 
     /**