diff options
author | Zach Copley <zach@status.net> | 2009-12-02 16:44:23 -0800 |
---|---|---|
committer | Zach Copley <zach@status.net> | 2009-12-02 16:44:23 -0800 |
commit | 4f359d2a8baa89f3ced8b9d7ac2c9dd1b4cfb73b (patch) | |
tree | 40486532c0e9a09caf3d0c8b1de508947694b805 /actions/groupdesignsettings.php | |
parent | 3e38d376a9ed53d6a6268106a7a85c1e9f131034 (diff) |
Delete design when user chooses to restore default design, instead
of saving a design with site defaults.
Diffstat (limited to 'actions/groupdesignsettings.php')
-rw-r--r-- | actions/groupdesignsettings.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/actions/groupdesignsettings.php b/actions/groupdesignsettings.php index b87b7d156..1c998efe1 100644 --- a/actions/groupdesignsettings.php +++ b/actions/groupdesignsettings.php @@ -173,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; } @@ -197,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); } /** |