diff options
author | Eric Helgeson <erichelgeson@gmail.com> | 2009-08-03 18:11:06 -0500 |
---|---|---|
committer | Eric Helgeson <erichelgeson@gmail.com> | 2009-08-03 18:11:06 -0500 |
commit | 0853ed069bb0b323d02cc8fe533ae82c87f68de5 (patch) | |
tree | 7ef1445197a5716d15a1ba40a1da6d6dc09b720f /lib/common.php | |
parent | 9e611b40c643af9f40b9ef84e02b859205943745 (diff) | |
parent | ff6e976d0315c57fc5b7e31845e9a3bad4f095bc (diff) |
Merge commit 'origin/0.8.x' into 0.9.x
Diffstat (limited to 'lib/common.php')
-rw-r--r-- | lib/common.php | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/lib/common.php b/lib/common.php index 9d7954fa9..b3d301862 100644 --- a/lib/common.php +++ b/lib/common.php @@ -94,14 +94,6 @@ $config = array('name' => 'Just another Laconica microblog', 'server' => $_server, 'theme' => 'default', - 'design' => - array('backgroundcolor' => '#CEE1E9', - 'contentcolor' => '#FFFFFF', - 'sidebarcolor' => '#C8D1D5', - 'textcolor' => '#000000', - 'linkcolor' => '#002E6E', - 'backgroundimage' => null, - 'disposition' => 1), 'path' => $_path, 'logfile' => null, 'logo' => null, @@ -261,6 +253,14 @@ $config = 'sessions' => array('handle' => false, // whether to handle sessions ourselves 'debug' => false), // debugging output for sessions + 'design' => + array('backgroundcolor' => null, // null -> 'use theme default' + 'contentcolor' => null, + 'sidebarcolor' => null, + 'textcolor' => null, + 'linkcolor' => null, + 'backgroundimage' => null, + 'disposition' => null), ); $config['db'] = &PEAR::getStaticProperty('DB_DataObject','options'); @@ -277,6 +277,10 @@ $config['db'] = 'quote_identifiers' => false, 'type' => 'mysql' ); +// Backward compatibility + +$config['site']['design'] =& $config['design']; + if (function_exists('date_default_timezone_set')) { /* Work internally in UTC */ date_default_timezone_set('UTC'); |