Merge branch 'master' into mmn_fixes

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

diff --git a/lib/default.php b/lib/default.php
index 4ebddcae4f0ca14e5b21747af4e4080a81c3b618..90bca32c4f4aeaba7e50041a8e3134d15196a412 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -36,6 +36,7 @@ $default =
               'theme' => 'neo-gnu',
               'path' => $_path,
               'logfile' => null,
+              'logdebug' => false,
               'logo' => null,
               'ssllogo' => null,
               'logperf' => false, // Enable to dump performance counters to syslog
@@ -296,7 +297,7 @@ $default =
         'group' =>
         array('maxaliases' => 3,
               'desclimit' => null,
-              'addtag' => false),
+              'addtag' => true),
         'peopletag' =>
         array('maxtags' => 100, // maximum number of tags a user can create.
               'maxpeople' => 500, // maximum no. of people with the same tag by the same user
@@ -344,6 +345,7 @@ $default =
               'default' => array(
                             'Activity' => array(),
                             'AntiBrute' => array(),
+                            'Blacklist' => array(),
                             'Bookmark' => array(),
                             'ClientSideShorten' => array(),
                             'DefaultLayout' => array(),