diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-06-17 23:56:42 -0700 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-06-17 23:56:42 -0700 |
commit | 79e732bd03c020eab36ceb13c5a712e76df3ac75 (patch) | |
tree | 48cd2d1b916a8f53beefa6c856677eb5278921f1 /lib/common.php | |
parent | 19d39b20294bad8dc14df26e76756c558a5083cf (diff) | |
parent | c14c9e1a086f0de29ef5c37fbeb34f6082b1c5ef (diff) |
Merge branch '0.8.x' into twitterpriv
Diffstat (limited to 'lib/common.php')
-rw-r--r-- | lib/common.php | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/lib/common.php b/lib/common.php index 51204cede..eb8a2b873 100644 --- a/lib/common.php +++ b/lib/common.php @@ -71,6 +71,15 @@ $config = array('name' => 'Just another Laconica microblog', 'server' => $_server, 'theme' => 'default', + 'skin' => 'default', + 'design' => + array('backgroundcolor' => '#F0F2F5', + 'contentcolor' => '#FFFFFF', + 'sidebarcolor' => '#CEE1E9', + 'textcolor' => '#000000', + 'linkcolor' => '#002E6E', + 'backgroundimage' => null, + 'disposition' => 1), 'path' => $_path, 'logfile' => null, 'logo' => null, @@ -111,6 +120,10 @@ $config = array('server' => null, 'dir' => INSTALLDIR . '/avatar/', 'path' => $_path . '/avatar/'), + 'background' => + array('server' => null, + 'dir' => INSTALLDIR . '/background/', + 'path' => $_path . '/background/'), 'public' => array('localonly' => true, 'blacklist' => array(), @@ -200,9 +213,11 @@ $config = 'file_quota' => 5000000, 'user_quota' => 50000000, 'monthly_quota' => 15000000, + 'uploads' => true, ), 'group' => array('maxaliases' => 3), + 'oohembed' => array('endpoint' => 'http://oohembed.com/oohembed/') ); $config['db'] = &PEAR::getStaticProperty('DB_DataObject','options'); |