Merge branch 'beautify_profile_list' into 'nightly'

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

diff --git a/lib/default.php b/lib/default.php
index 490553f80b21ea1163cd4e995f8a284b18d985a6..5b504cea3f84e0a4ab47a5913a0bfbe28a83fdc8 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -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(),
@@ -276,10 +271,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' =>