summaryrefslogtreecommitdiff
path: root/lib/default.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-12-28 15:49:27 -0800
committerEvan Prodromou <evan@status.net>2009-12-28 15:49:27 -0800
commite119362fde9eabb27d48c94a98624aeae68e436c (patch)
tree04d2e1fb5e1b2a5b64c4d0ef12b532397ec0a331 /lib/default.php
parent98a579fedf36ff795e255a4b345651df0ee230bc (diff)
parentca6669538a16f36f92df918d679671b95b1859ac (diff)
Merge branch 'locshunt' into 0.9.x
Diffstat (limited to 'lib/default.php')
-rw-r--r--lib/default.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/default.php b/lib/default.php
index 42d4623b1..8a70ed3fa 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -226,7 +226,8 @@ $default =
'message' =>
array('contentlimit' => null),
'location' =>
- array('namespace' => 1), // 1 = geonames, 2 = Yahoo Where on Earth
+ array('share' => 'user', // whether to share location; 'always', 'user', 'never'
+ 'sharedefault' => true),
'omb' =>
array('timeout' => 5), // HTTP request timeout in seconds when contacting remote hosts for OMB updates
'logincommand' =>