diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-04 06:07:28 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-04 06:07:28 -0800 |
| commit | b218aee94e581230e1efa14d4ae1a19756986ddf (patch) | |
| tree | a832ddf3b4322b520fd20c4d8ea2d31720c3679b /lib/default.php | |
| parent | 358556057a87c0cb9291223a2026782e6548ff2e (diff) | |
| parent | 14d7f4a598d0e24467fe3eafd9a02b0e651edad8 (diff) | |
Merge commit 'origin/testing' into 0.9.x
Conflicts:
lib/action.php
lib/adminpanelaction.php
Diffstat (limited to 'lib/default.php')
| -rw-r--r-- | lib/default.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/default.php b/lib/default.php index 7b97c7dda..c46c3eef5 100644 --- a/lib/default.php +++ b/lib/default.php @@ -40,7 +40,8 @@ $default = 'logdebug' => false, 'fancy' => false, 'locale_path' => INSTALLDIR.'/locale', - 'language' => 'en_US', + 'language' => 'en', + 'langdetect' => true, 'languages' => get_all_languages(), 'email' => array_key_exists('SERVER_ADMIN', $_SERVER) ? $_SERVER['SERVER_ADMIN'] : null, @@ -53,10 +54,11 @@ $default = 'ssl' => 'never', 'sslserver' => null, 'shorturllength' => 30, - 'dupelimit' => 60, # default for same person saying the same thing + 'dupelimit' => 60, // default for same person saying the same thing 'textlimit' => 140, 'indent' => true, - 'use_x_sendfile' => false + 'use_x_sendfile' => false, + 'notice' => null // site wide notice text ), 'db' => array('database' => 'YOU HAVE TO SET THIS IN config.php', @@ -283,7 +285,7 @@ $default = 'OpenID' => null), ), 'admin' => - array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions')), + array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice')), 'singleuser' => array('enabled' => false, 'nickname' => null), |