From 4f359d2a8baa89f3ced8b9d7ac2c9dd1b4cfb73b 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/userdesignsettings.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'actions/userdesignsettings.php')

diff --git a/actions/userdesignsettings.php b/actions/userdesignsettings.php
index 568c1d624..31a097970 100644
--- a/actions/userdesignsettings.php
+++ b/actions/userdesignsettings.php
@@ -96,14 +96,8 @@ class UserDesignSettingsAction extends DesignSettingsAction
 
     function getWorkingDesign()
     {
-
         $user   = common_current_user();
         $design = $user->getDesign();
-
-        if (empty($design)) {
-            $design = $this->defaultDesign();
-        }
-
         return $design;
     }
 
@@ -117,7 +111,13 @@ class UserDesignSettingsAction 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