summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2009-12-02 16:44:23 -0800
committerZach Copley <zach@status.net>2009-12-03 00:56:53 +0000
commit008f51db4df53b0b55424d6d5c326917e70ac00f (patch)
tree78fb2779285ff03e1506fe395cb8df00ed83833e /actions
parent987d59c2421bc44b6c860c8bce47af2b33339929 (diff)
Delete design when user chooses to restore default design, instead
of saving a design with site defaults.
Diffstat (limited to 'actions')
-rw-r--r--actions/groupdesignsettings.php13
-rw-r--r--actions/userdesignsettings.php14
2 files changed, 14 insertions, 13 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);
}
/**
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);
}
/**