summaryrefslogtreecommitdiff
path: root/classes/Design.php
diff options
context:
space:
mode:
Diffstat (limited to 'classes/Design.php')
-rw-r--r--classes/Design.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/classes/Design.php b/classes/Design.php
index 43544f1c9..19c9e0292 100644
--- a/classes/Design.php
+++ b/classes/Design.php
@@ -107,7 +107,7 @@ class Design extends Memcached_DataObject
static function toWebColor($color)
{
- if (is_null($color)) {
+ if ($color == null) {
return null;
}
@@ -115,7 +115,7 @@ class Design extends Memcached_DataObject
return new WebColor($color);
} catch (WebColorException $e) {
// This shouldn't happen
- common_log(LOG_ERR, "Unable to create color for design $id.",
+ common_log(LOG_ERR, "Unable to create web color for $color",
__FILE__);
return null;
}
@@ -204,7 +204,10 @@ class Design extends Memcached_DataObject
'disposition');
foreach ($attrs as $attr) {
- $siteDesign->$attr = common_config('design', $attr);
+ $val = common_config('design', $attr);
+ if ($val !== false) {
+ $siteDesign->$attr = $val;
+ }
}
}