Merge branch '0.9.x' into 1.0.x

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

diff --git a/lib/default.php b/lib/default.php
index ce61de5ea5e499c3d793dbf23d813edd7aeea16a..9528d9cf8be30ebd39919a9275145554e9a97474 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -76,7 +76,8 @@ $default =
               'schemacheck' => 'runtime', // 'runtime' or 'script'
               'annotate_queries' => false, // true to add caller comments to queries, eg /* POST Notice::saveNew */
               'log_queries' => false, // true to log all DB queries
-              'log_slow_queries' => 0), // if set, log queries taking over N seconds
+              'log_slow_queries' => 0, // if set, log queries taking over N seconds
+              'mysql_foreign_keys' => false), // if set, enables experimental foreign key support on MySQL
         'syslog' =>
         array('appname' => 'statusnet', # for syslog
               'priority' => 'debug', # XXX: currently ignored
@@ -309,11 +310,14 @@ $default =
                                  'OStatus' => null,
                                  'WikiHashtags' => null,
                                  'RSSCloud' => null,
+                                 'ClientSideShorten' => null,
+                                 'StrictTransportSecurity' => null,
                                  'OpenID' => null),
               'locale_path' => false, // Set to a path to use *instead of* each plugin's own locale subdirectories
               ),
+        'pluginlist' => array(),
         'admin' =>
-        array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license')),
+        array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license', 'plugins')),
         'singleuser' =>
         array('enabled' => false,
               'nickname' => null),
@@ -328,6 +332,10 @@ $default =
               'members' => true,
               'peopletag' => true,
               'external' => 'sometimes'), // Options: 'sometimes', 'never', default = 'sometimes'
+        'url' =>
+        array('shortener' => 'ur1.ca',
+              'maxlength' => 25,
+              'maxnoticelength' => -1),
         'http' => // HTTP client settings when contacting other sites
         array('ssl_cafile' => false, // To enable SSL cert validation, point to a CA bundle (eg '/usr/lib/ssl/certs/ca-certificates.crt')
               'curl' => false, // Use CURL backend for HTTP fetches if available. (If not, PHP's socket streams will be used.)