Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

This commit is contained in:
Brion Vibber
2010-02-08 15:48:52 -08:00
74 changed files with 992 additions and 82 deletions

View File

@@ -77,6 +77,7 @@ class ApiAction extends Action
function prepare($args)
{
StatusNet::setApi(true); // reduce exception reports to aid in debugging
parent::prepare($args);
$this->format = $this->arg('format');