diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-07-01 12:58:49 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-07-01 12:58:49 -0400 |
| commit | 721ba6c88f3c89c3efcc8e5f0c9169d94911825d (patch) | |
| tree | f1b07dfc50858d98258a3043e3c6dbf4f00a22e3 /lib/common.php | |
| parent | 8a8390c1a78a2586bb2e9e10bfcb3502739d8d76 (diff) | |
| parent | 6c28a07cf58120e271de6e0c9c89a1f9a6d0101e (diff) | |
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
Diffstat (limited to 'lib/common.php')
| -rw-r--r-- | lib/common.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/common.php b/lib/common.php index e2936f075..5d451463b 100644 --- a/lib/common.php +++ b/lib/common.php @@ -120,6 +120,7 @@ $config = 'private' => false, 'ssl' => 'never', 'sslserver' => null, + 'shorturllength' => 30, 'dupelimit' => 60), # default for same person saying the same thing 'syslog' => array('appname' => 'laconica', # for syslog @@ -175,6 +176,8 @@ $config = 'host' => null, # only set if != server 'debug' => false, # print extra debug info 'public' => array()), # JIDs of users who want to receive the public stream + 'invite' => + array('enabled' => true), 'sphinx' => array('enabled' => false, 'server' => 'localhost', |