diff options
| author | Brion Vibber <brion@pobox.com> | 2010-06-26 10:16:27 -0400 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-06-26 10:16:27 -0400 |
| commit | d9e56e15cc3174093fc994e524d1d9cf402ae8a3 (patch) | |
| tree | ba673d3417cca00b2db1e7d2c1bd7697f9712215 /lib/router.php | |
| parent | b66709215309126969104ad114874360785f3d57 (diff) | |
| parent | 9eb5a976b03fae6bd1e1fce6abfe4a6c7964d1ae (diff) | |
Merge branch 'master' into testing
Diffstat (limited to 'lib/router.php')
| -rw-r--r-- | lib/router.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/router.php b/lib/router.php index fec229c9b..7e1e6a2a4 100644 --- a/lib/router.php +++ b/lib/router.php @@ -667,9 +667,9 @@ class Router ); // search - $m->connect('api/search.atom', array('action' => 'twitapisearchatom')); - $m->connect('api/search.json', array('action' => 'twitapisearchjson')); - $m->connect('api/trends.json', array('action' => 'twitapitrends')); + $m->connect('api/search.atom', array('action' => 'ApiSearchAtom')); + $m->connect('api/search.json', array('action' => 'ApiSearchJSON')); + $m->connect('api/trends.json', array('action' => 'ApiTrends')); $m->connect('api/oauth/request_token', array('action' => 'apioauthrequesttoken')); |