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 c0d559e1cc27dcba88d396bba939a7abbe3fa559..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' =>
@@ -337,7 +338,6 @@ $default =
               'path' => null,
               'sslpath' => null,
               ),
-        'pluginlist' => array(),
         'admin' =>
         array('panels' => array('site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license', 'plugins')),
         'singleuser' =>