Merge commit 'jeff-themovie/invite-enabled' into 0.8.x

* commit 'jeff-themovie/invite-enabled': Adds $config['invite']['enabled'] to enable/disable invites.
2009-06-30 16:10:12 -07:00
parent 190d45cd05 925b3f32ea
commit b10dba2798
8 changed files with 38 additions and 18 deletions
--- a/lib/common.php
+++ b/lib/common.php
@@ -175,6 +175,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',