diff options
| author | Brion Vibber <brion@pobox.com> | 2010-06-11 12:05:53 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-06-11 12:05:53 -0700 |
| commit | 7f3b3620af2af88ced37da1d9f8913cfd1a31b90 (patch) | |
| tree | 13f137c377c3dfebbb2e749866e958ede08c2d24 /lib/default.php | |
| parent | e81f17e911f59c5ba68fddefd318ea6caf25924c (diff) | |
| parent | 47665e845ae74e6ee5b9a39565fb45dd9a93f921 (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/default.php')
| -rw-r--r-- | lib/default.php | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/default.php b/lib/default.php index 950c6018d..dcf225d1f 100644 --- a/lib/default.php +++ b/lib/default.php @@ -141,10 +141,17 @@ $default = 'dir' => null, 'path'=> null, 'ssl' => null), + 'theme_upload' => + array('enabled' => extension_loaded('zip')), 'javascript' => array('server' => null, 'path'=> null, 'ssl' => null), + 'local' => // To override path/server for themes in 'local' dir (not currently applied to local plugins) + array('server' => null, + 'dir' => null, + 'path' => null, + 'ssl' => null), 'throttle' => array('enabled' => false, // whether to throttle edits; false by default 'count' => 20, // number of allowed messages in timespan @@ -260,6 +267,9 @@ $default = 'linkcolor' => null, 'backgroundimage' => null, 'disposition' => null), + 'custom_css' => + array('enabled' => true, + 'css' => ''), 'notice' => array('contentlimit' => null), 'message' => |