Delete design when user chooses to restore default design, instead

of saving a design with site defaults.

2 files changed, 9 insertions, 60 deletions

diff --git a/lib/api.php b/lib/api.php
index e2ea87b43..5a3bb5ee4 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -134,7 +134,6 @@ class ApiAction extends Action
         $twitter_user['protected'] = false; # not supported by StatusNet yet
         $twitter_user['followers_count'] = $profile->subscriberCount();
 
-        $defaultDesign = Design::siteDesign();
         $design        = null;
         $user          = $profile->getUser();
 
@@ -145,7 +144,7 @@ class ApiAction extends Action
         }
 
         if (empty($design)) {
-            $design = $defaultDesign;
+            $design = Design::siteDesign();
         }
 
         $color = Design::toWebColor(empty($design->backgroundcolor) ? $defaultDesign->backgroundcolor : $design->backgroundcolor);
diff --git a/lib/designsettings.php b/lib/designsettings.php
index 5ce9ddeda..7b8c78c30 100644
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -334,49 +334,6 @@ class DesignSettingsAction extends AccountSettingsAction
     }
 
     /**
-     * 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
      *
      * @param Design $design a working design to attach the img to
@@ -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);