summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Lang <mail@adrianlang.de>2009-08-10 15:01:00 +0200
committerEvan Prodromou <evan@controlyourself.ca>2009-08-10 16:35:09 -0400
commitbbf10e5bdf3ee0dfa372b170da6e25bee859b3c5 (patch)
tree813dd4d17e9922d048d21dd6f4cfa2541f82fcb1
parent77037b3cc369f1d32ce79e9f9fb990f68d323827 (diff)
common_config returns false if the config value is not set. Design::toWebColor checks with is_null. Hence the common_config value should be adjusted.
-rw-r--r--classes/Design.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/classes/Design.php b/classes/Design.php
index 9354bfcda..19c9e0292 100644
--- a/classes/Design.php
+++ b/classes/Design.php
@@ -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;
+ }
}
}