diff options
author | Sarven Capadisli <csarven@status.net> | 2010-03-03 17:48:42 -0500 |
---|---|---|
committer | Sarven Capadisli <csarven@status.net> | 2010-03-03 17:48:42 -0500 |
commit | c16f9754e67ced68346fab8b2ac1e4a8b230de07 (patch) | |
tree | 001ceb73a179f15524d3c4cd49d5600cd947a1d9 /lib/default.php | |
parent | b3969be85ae37b2b3e8abfce2c545866dd910af7 (diff) | |
parent | 337b1aaaa16bde80b42a9902ebeb299f8f13a226 (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib/default.php')
-rw-r--r-- | lib/default.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/default.php b/lib/default.php index b7216045c..8e99a0e1c 100644 --- a/lib/default.php +++ b/lib/default.php @@ -54,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 +284,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), |