Remove missing twittersettings page from subscriptions helper

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

diff --git a/lib/default.php b/lib/default.php
index cdd8e5460da7bd5bfeb5db2d0113e11cb5cb1074..673c94769a89d90070c456f4fe6183becb69a55d 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -58,7 +58,7 @@ $default =
               'sslserver' => null,
               'shorturllength' => 30,
               'dupelimit' => 60, // default for same person saying the same thing
-              'textlimit' => 140,
+              'textlimit' => 0, // in chars; 0 == no limit
               'indent' => true,
               'use_x_sendfile' => false,
               'notice' => null, // site wide notice text
@@ -286,20 +286,9 @@ $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
-        'design' =>
-        array('backgroundcolor' => null, // null -> 'use theme default'
-              'contentcolor' => null,
-              'sidebarcolor' => null,
-              'textcolor' => null,
-              'linkcolor' => null,
-              'backgroundimage' => null,
-              'disposition' => null),
-        'custom_css' =>
-        array('enabled' => true,
-              'css' => ''),
         'notice' =>
         array('contentlimit' => null,
-              'defaultscope' => 0), // set to 0 for default open
+              'defaultscope' => null), // null means 1 if site/private, 0 otherwise
         'message' =>
         array('contentlimit' => null),
         'location' =>
@@ -321,7 +310,8 @@ $default =
                                  'TagSub' => null,
                                  'OpenID' => null,
                                  'Directory' => null,
-                                 'ExtendedProfile' => null),
+                                 'ExtendedProfile' => null,
+                                 'Activity' => null),
               'locale_path' => false, // Set to a path to use *instead of* each plugin's own locale subdirectories
               'server' => null,
               'sslserver' => null,
@@ -330,7 +320,7 @@ $default =
               ),
         'pluginlist' => array(),
         'admin' =>
-        array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license', 'plugins')),
+        array('panels' => array('site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license', 'plugins')),
         'singleuser' =>
         array('enabled' => false,
               'nickname' => null),
@@ -360,4 +350,8 @@ $default =
               ),
         'router' =>
         array('cache' => true), // whether to cache the router object. Defaults to true, turn off for devel
+        'discovery' =>
+          array('cors' => false), // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
+       'performance' => array('high' => false), // disable some features for higher performance; default false
+       'oldschool' => array('enabled' => false) // enable users to use old-style UI
     );