Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

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

diff --git a/lib/default.php b/lib/default.php
index 8489caab504c90369ce1a6556d20289cd156e33e..860957bf9ee861aab5560bd505e2453ab044cea1 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -53,7 +53,7 @@ $default =
               'broughtbyurl' => null,
               'closed' => false,
               'inviteonly' => false,
-              'private' => false,
+              'private' => true,
               'ssl' => 'never',
               'sslserver' => null,
               'shorturllength' => 30,
@@ -274,7 +274,10 @@ $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),
-        'oohembed' => array('endpoint' => 'http://oohembed.com/oohembed/'),
+        'oembed' => 
+        array('endpoint' => 'http://oohembed.com/oohembed/',
+              'order' => array('built-in', 'well-known', 'service', 'discovery'),
+        ),
         'search' =>
         array('type' => 'fulltext'),
         'sessions' =>
@@ -293,7 +296,8 @@ $default =
         array('enabled' => true,
               'css' => ''),
         'notice' =>
-        array('contentlimit' => null),
+        array('contentlimit' => null,
+              'defaultscope' => 0), // set to 0 for default open
         'message' =>
         array('contentlimit' => null),
         'location' =>
@@ -305,13 +309,17 @@ $default =
         array('disabled' => true),
         'plugins' =>
         array('default' => array('Geonames' => null,
-                                 'Mapstraction' => null,
-                                 'OStatus' => null,
-                                 'WikiHashtags' => null,
-                                 'RSSCloud' => null,
                                  'ClientSideShorten' => null,
                                  'StrictTransportSecurity' => null,
-                                 'OpenID' => null),
+                                 'Bookmark' => null,
+                                 'Event' => null,
+                                 'Poll' => null,
+                                 'QnA' => null,
+                                 'SearchSub' => null,
+                                 'TagSub' => null,
+                                 'OpenID' => null,
+                                 'Directory' => null,
+                                 'ExtendedProfile' => null),
               'locale_path' => false, // Set to a path to use *instead of* each plugin's own locale subdirectories
               'server' => null,
               'sslserver' => null,