summaryrefslogtreecommitdiff
path: root/lib/common.php
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-06-22 10:56:02 -0700
committerZach Copley <zach@controlyourself.ca>2009-06-22 10:56:02 -0700
commite6559e3bea1881710094c06c778bbfe41dd72824 (patch)
treefd0c706f8f57213bdfa0dd98524a42ccee938e27 /lib/common.php
parent9014a0a90d9ab5ee408aded51f379fd084fcd82c (diff)
parent7b269a6712ac740c961634b0c165e6f74f420236 (diff)
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
* '0.8.x' of git@gitorious.org:laconica/dev: Layout fix for IE6 theme dir, path configurable
Diffstat (limited to 'lib/common.php')
-rw-r--r--lib/common.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/common.php b/lib/common.php
index 14f5c7a7f..0333030e1 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -140,7 +140,9 @@ $config =
'blacklist' => array(),
'autosource' => array()),
'theme' =>
- array('server' => null),
+ array('server' => null,
+ 'dir' => null,
+ 'path'=> null),
'throttle' =>
array('enabled' => false, // whether to throttle edits; false by default
'count' => 20, // number of allowed messages in timespan