diff options
| author | Sarven Capadisli <csarven@status.net> | 2009-11-02 16:44:12 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2009-11-02 16:44:12 +0000 |
| commit | eeed7f54377d8a6bafacd0662c7907681b3ed0cf (patch) | |
| tree | 7c17043eef8bd8e9ab9b5205ee748521e2023f4f /lib/default.php | |
| parent | 8d35831b54d6ff8f732f2e91c4153b90c3ed7a4f (diff) | |
| parent | b22fc5b74aecd505d4e2df01258171fc65d312cf (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/default.php')
| -rw-r--r-- | lib/default.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/default.php b/lib/default.php index f6cc4b725..7ec8558b0 100644 --- a/lib/default.php +++ b/lib/default.php @@ -228,6 +228,8 @@ $default = array('contentlimit' => null), 'message' => array('contentlimit' => null), + 'http' => + array('client' => 'curl'), // XXX: should this be the default? 'location' => array('namespace' => 1), // 1 = geonames, 2 = Yahoo Where on Earth ); |