Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

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

diff --git a/lib/default.php b/lib/default.php
index 11456ec4d0bee9cae2d8d51c467a13ac206678d0..938716b3a4361cda496a94946eae67fa8ef444e0 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -28,7 +28,7 @@
  */
 
 $default =
-  array('site' =>
+    array('site' =>
         array('name' => 'Just another StatusNet microblog',
               'nickname' => 'statusnet',
               'wildcard' => null,
@@ -156,7 +156,8 @@ $default =
         'javascript' =>
         array('server' => null,
               'path'=> null,
-              'ssl' => null),
+              'ssl' => null,
+              'bustframes' => true),
         'local' => // To override path/server for themes in 'local' dir (not currently applied to local plugins)
         array('server' => null,
               'dir' => null,
@@ -190,9 +191,9 @@ $default =
               'user' => false,
               'group' => false),
         'emailpost' =>
-        array('enabled' => true),
+        array('enabled' => false),
         'sms' =>
-        array('enabled' => true),
+        array('enabled' => false),
         'twitterimport' =>
         array('enabled' => false),
         'integration' =>
@@ -268,7 +269,8 @@ $default =
         array('desclimit' => null),
         'group' =>
         array('maxaliases' => 3,
-              'desclimit' => null),
+              'desclimit' => null,
+              'addtag' => false),
         'peopletag' =>
         array('maxtags' => 100, // maximum number of tags a user can create.
               'maxpeople' => 500, // maximum no. of people with the same tag by the same user
@@ -284,17 +286,6 @@ $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
@@ -328,7 +319,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),
@@ -356,6 +347,6 @@ $default =
               'proxy_password' => null,
               'proxy_auth_scheme' => null,
               ),
-       'router' =>
-       array('cache' => true), // whether to cache the router object. Defaults to true, turn off for devel
-        );
+        'router' =>
+        array('cache' => true), // whether to cache the router object. Defaults to true, turn off for devel
+    );