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.

---
 lib/designsettings.php | 66 ++++++--------------------------------------------
 1 file changed, 8 insertions(+), 58 deletions(-)

(limited to 'lib/designsettings.php')

diff --git a/lib/designsettings.php b/lib/designsettings.php
index 99f44b5b7..b70ba0dfc 100644
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -333,49 +333,6 @@ class DesignSettingsAction extends AccountSettingsAction
         $this->autofocus('design_background-image_file');
     }
 
-    /**
-     * Get a default design
-     *
-     * @return Design design
-     */
-
-    function defaultDesign()
-    {
-        $defaults = common_config('site', 'design');
-
-        $design = new Design();
-
-        try {
-
-            $color = new WebColor();
-
-            $color->parseColor($defaults['backgroundcolor']);
-            $design->backgroundcolor = $color->intValue();
-
-            $color->parseColor($defaults['contentcolor']);
-            $design->contentcolor = $color->intValue();
-
-            $color->parseColor($defaults['sidebarcolor']);
-            $design->sidebarcolor = $color->intValue();
-
-            $color->parseColor($defaults['textcolor']);
-            $design->textcolor = $color->intValue();
-
-            $color->parseColor($defaults['linkcolor']);
-            $design->linkcolor = $color->intValue();
-
-            $design->backgroundimage = $defaults['backgroundimage'];
-
-            $design->disposition = $defaults['disposition'];
-
-        } catch (WebColorException $e) {
-            common_log(LOG_ERR, _('Bad default color settings: ' .
-                $e->getMessage()));
-        }
-
-        return $design;
-    }
-
     /**
      * Save the background image, if any, and set its disposition
      *
@@ -445,24 +402,17 @@ class DesignSettingsAction extends AccountSettingsAction
 
     function restoreDefaults()
     {
-        $design   = $this->getWorkingDesign();
-        $default  = $this->defaultDesign();
-        $original = clone($design);
-
-        $design->backgroundcolor = $default->backgroundcolor;
-        $design->contentcolor    = $default->contentcolor;
-        $design->sidebarcolor    = $default->sidebarcolor;
-        $design->textcolor       = $default->textcolor;
-        $design->linkcolor       = $default->linkcolor;
+        $design = $this->getWorkingDesign();
 
-        $design->setDisposition(false, true, false);
+        if (!empty($design)) {
 
-        $result = $design->update($original);
+            $result = $design->delete();
 
-        if ($result === false) {
-            common_log_db_error($design, 'UPDATE', __FILE__);
-            $this->showForm(_('Couldn\'t update your design.'));
-            return;
+            if ($result === false) {
+                common_log_db_error($design, 'DELETE', __FILE__);
+                $this->showForm(_('Couldn\'t update your design.'));
+                return;
+            }
         }
 
         $this->showForm(_('Design defaults restored.'), true);
-- 
cgit v1.2.3-54-g00ecf