Merge branch 'tagprofile-ajax-fix' into 'nightly'

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

diff --git a/lib/default.php b/lib/default.php
index dfa3626927884a23b87da853c3311d6e903cb7ea..0ec9fc4e14d1cc5a67c2f9b7316b17b526797733 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -48,6 +48,7 @@ $default =
               'languages' => get_all_languages(),
               'email' =>
               array_key_exists('SERVER_ADMIN', $_SERVER) ? $_SERVER['SERVER_ADMIN'] : null,
+              'fakeaddressrecovery' => true,
               'broughtby' => null,
               'timezone' => 'UTC',
               'broughtbyurl' => null,
@@ -181,7 +182,7 @@ $default =
         array('dropoff' => 864000.0,   # controls weighting based on age
               'cutoff' => 86400 * 90), # only look at notices favorited in last 90 days
         'daemon' =>
-        array('piddir' => '/var/run',
+        array('piddir' => sys_get_temp_dir(),
               'user' => false,
               'group' => false),
         'emailpost' =>
@@ -285,6 +286,11 @@ $default =
         array('handle' => false,   // whether to handle sessions ourselves
               'debug' => false,    // debugging output for sessions
               'gc_limit' => 1000), // max sessions to expire at a time
+        'htmlfilter' => array(  // purify HTML through htmLawed
+            'img' => true,
+            'video' => true,
+            'audio' => true,
+        ),
         'notice' =>
         array('contentlimit' => null,
               'defaultscope' => null, // null means 1 if site/private, 0 otherwise
@@ -298,9 +304,11 @@ $default =
         array('disabled' => true),
         'plugins' =>
         array('core' => array(
+                            'ActivityVerb' => array(),
                             'AuthCrypt' => array(),
                             'Cronish' => array(),
                             'Favorite' => array(),
+                            'Share' => array(),
                             'LRDD' => array(),
                             'StrictTransportSecurity' => array(),
                         ),