summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Lang <mail@adrianlang.de>2009-08-10 15:01:00 +0200
committerAdrian Lang <mail@adrianlang.de>2009-08-10 15:01:00 +0200
commit5ba46186b7dd179253023426f6d7cdbbee67ad98 (patch)
tree5a4a5bb43b4e23b5cac8f7100bb321e465082a0e
parente1270b26f5eae1c3d7ea4b954f0bc1f51d73494c (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 dc1712aff..de3a526f7 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;
+ }
}
}