summaryrefslogtreecommitdiff
path: root/lib/router.php
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2009-07-13 14:58:39 -0400
committerCraig Andrews <candrews@integralblue.com>2009-07-13 14:58:39 -0400
commite047ba52c7c3f5953336d46fd22715d880002720 (patch)
treeedc29593a7a96e89cd7bd6d2b0b413bc4244fc77 /lib/router.php
parent678f054bfe51e74e26a992ae7de84b73ea95baee (diff)
parent91324890ae130a6f4280c9f6d82151793611de1f (diff)
Merge branch 'tags-timeline-api' into 0.8.x
Diffstat (limited to 'lib/router.php')
-rw-r--r--lib/router.php9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/router.php b/lib/router.php
index 8104d7818..e12138637 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -403,6 +403,15 @@ class Router
array('action' => 'api',
'apiaction' => 'groups'));
+ // Tags
+ $m->connect('api/laconica/tags/:method/:argument',
+ array('action' => 'api',
+ 'apiaction' => 'tags'));
+
+ $m->connect('api/laconica/tags/:method',
+ array('action' => 'api',
+ 'apiaction' => 'tags'));
+
// search
$m->connect('api/search.atom', array('action' => 'twitapisearchatom'));
$m->connect('api/search.json', array('action' => 'twitapisearchjson'));