From 008f51db4df53b0b55424d6d5c326917e70ac00f Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 2 Dec 2009 16:44:23 -0800
Subject: Delete design when user chooses to restore default design, instead of
 saving a design with site defaults.

---
 actions/groupdesignsettings.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'actions/groupdesignsettings.php')

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);
     }
 
     /**
-- 
cgit v1.2.3-54-g00ecf