Merge branch '0.8.x' into invite-enabled

[quix0rs-gnu-social.git] / lib / common.php

diff --git a/lib/common.php b/lib/common.php
index bb1a4255da7fa9a5d7869f93eb7ee8e97d502812..c9e5fb0c9c7c7ec3b0f1d652b8a5be797f874f98 100644 (file)
--- 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',