X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FDesign.php;h=89ae50c8cb9d72b9a17be6f43d1731890c328503;hb=4312ea90aa46299bfd77454e441f9ecb867fadd1;hp=43544f1c9d54e8bcf2cb37fb56103960335c6717;hpb=7292c1aa784dc2213305253a96c97cc39472cccb;p=quix0rs-gnu-social.git

diff --git a/classes/Design.php b/classes/Design.php
index 43544f1c9d..89ae50c8cb 100644
--- a/classes/Design.php
+++ b/classes/Design.php
@@ -1,7 +1,7 @@
 <?php
 /*
- * Laconica - the distributed open-source microblogging tool
- * Copyright (C) 2009, Control Yourself, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -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;
+                }
             }
         }