Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly

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

diff --git a/lib/default.php b/lib/default.php
index 6369fbddc6004f12d6f978168e29142a9f1be0e3..5bec29cc5233880c169f0dcf3da8828748c23302 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,
@@ -128,7 +129,7 @@ $default =
               'biolimit' => null,
               'changenick' => false,
               'backup' => true,
-              'restore' => true,
+              'restore' => false,
               'delete' => false,
               'move' => true),
         'image' =>
@@ -326,7 +327,6 @@ $default =
                             'OpportunisticQM' => array(),
                             'OStatus' => array(),
                             'Poll' => array(),
-                            'QnA' => array(),
                             'SearchSub' => array(),
                             'TagSub' => array(),
                             'WebFinger' => array(),