Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/lib/default.php b/lib/default.php
index caa24766146f9a4842ce8b8b67a1cd5c8604eaa3..65293a8c934342d0de76023da1b7a8993745506e 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -129,7 +129,7 @@ $default =
               'biolimit' => null,
               'changenick' => false,
               'backup' => true,
-              'restore' => true,
+              'restore' => false,
               'delete' => false,
               'move' => true),
         'image' =>
@@ -140,11 +140,6 @@ $default =
               'path' => $_path . '/avatar/',
               'ssl' => null,
               'maxsize' => 300),
-        'background' =>
-        array('server' => null,
-              'dir' => INSTALLDIR . '/background/',
-              'path' => $_path . '/background/',
-              'ssl' => null),
         'public' =>
         array('localonly' => false,
               'blacklist' => array(),
@@ -277,10 +272,6 @@ $default =
               'maxpeople' => 500, // maximum no. of people with the same tag by the same user
               'allow_tagging' => array('all' => true), // equivalent to array('local' => true, 'remote' => true)
               'desclimit' => null),
-        'oembed' =>
-        array('endpoint' => null,   // 'https://noembed.com/embed/' for proxied oEmbed data
-              'order' => array('built-in', 'well-known', 'service', 'discovery'),
-        ),
         'search' =>
         array('type' => 'like'),
         'sessions' =>
@@ -306,12 +297,13 @@ $default =
         'plugins' =>
         array('core' => array(
                             'ActivityVerb' => array(),
+                            'ActivityVerbPost' => array(),
+                            'ActivityModeration' => array(),
                             'AuthCrypt' => array(),
                             'Cronish' => array(),
                             'Favorite' => array(),
                             'Share' => array(),
                             'LRDD' => array(),
-                            'StrictTransportSecurity' => array(),
                         ),
               'default' => array(
                             'Activity' => array(),