summaryrefslogtreecommitdiff
path: root/lib/common.php
diff options
context:
space:
mode:
authorTobias Diekershoff <tobias.diekershoff@gmx.net>2009-04-10 14:25:25 +0200
committerTobias Diekershoff <tobias.diekershoff@gmx.net>2009-04-10 14:25:25 +0200
commit4277a6818c6ac66158dfba3b94bdc1b2eb06b594 (patch)
tree99149b95d0bd0bfaac4b2ad3d646e8cc1da7f51a /lib/common.php
parentd1bf8b2143f597d9d1b1e7ff472532c596200011 (diff)
parent6cdc2ff444b8c76a3cdc5b8c6e9e7e7539d9b6cc (diff)
Merge branch '0.7.x' of git://gitorious.org/laconica/dev into 0.7.x
Diffstat (limited to 'lib/common.php')
-rw-r--r--lib/common.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/common.php b/lib/common.php
index 1ca9e521b..b3882d207 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -19,7 +19,7 @@
if (!defined('LACONICA')) { exit(1); }
-define('LACONICA_VERSION', '0.7.2.1');
+define('LACONICA_VERSION', '0.7.3');
define('AVATAR_PROFILE_SIZE', 96);
define('AVATAR_STREAM_SIZE', 48);
@@ -87,6 +87,8 @@ $config =
'closed' => false,
'inviteonly' => false,
'private' => false,
+ 'ssl' => 'never',
+ 'sslserver' => null,
'dupelimit' => 60), # default for same person saying the same thing
'syslog' =>
array('appname' => 'laconica', # for syslog
@@ -151,6 +153,9 @@ $config =
array('notify' => array()),
'inboxes' =>
array('enabled' => true), # on by default for new sites
+ 'newuser' =>
+ array('subscribe' => null,
+ 'welcome' => null),
);
$config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');