Merge branch 'master' into mmn_fixes

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

diff --git a/lib/default.php b/lib/default.php
index 5e1149657047b9de4f0fc70e2867735992fb106f..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
@@ -247,6 +248,7 @@ $default =
                                 'application/vnd.oasis.opendocument.text-web'               => 'oth',
                                 'application/pdf'   => 'pdf',
                                 'application/zip'   => 'zip',
+                                'application/x-bzip2' => 'bz2',
                                 'application/x-go-sgf' => 'sgf',
                                 'application/xml'   => 'xml',
                                 'application/gpx+xml' => 'gpx',
@@ -295,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
@@ -343,6 +345,7 @@ $default =
               'default' => array(
                             'Activity' => array(),
                             'AntiBrute' => array(),
+                            'Blacklist' => array(),
                             'Bookmark' => array(),
                             'ClientSideShorten' => array(),
                             'DefaultLayout' => array(),