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 84eaf3bf2a46d69c289b920de62d42e09de9ab62..860957bf9ee861aab5560bd505e2453ab044cea1 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -269,6 +269,11 @@ $default =
         'group' =>
         array('maxaliases' => 3,
               'desclimit' => null),
+        '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
+              'allow_tagging' => array('all' => true), // equivalent to array('local' => true, 'remote' => true)
+              'desclimit' => null),
         'oembed' => 
         array('endpoint' => 'http://oohembed.com/oohembed/',
               'order' => array('built-in', 'well-known', 'service', 'discovery'),
@@ -312,7 +317,9 @@ $default =
                                  'QnA' => null,
                                  'SearchSub' => null,
                                  'TagSub' => null,
-                                 'OpenID' => 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,