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

Conflicts: lib/profileblock.php theme/default/css/display.css
2011-04-09 21:57:45 +05:30
parent a0ac51c22f 285c2ee72d
commit f47027abbe
206 changed files with 314 additions and 17667 deletions
--- a/lib/default.php
+++ b/lib/default.php
@@ -317,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,