summaryrefslogtreecommitdiff
path: root/lib/router.php
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2009-07-17 12:33:56 -0400
committerCraig Andrews <candrews@integralblue.com>2009-07-17 12:33:56 -0400
commit3dbbefd5ad63679162659ce736e9e556f2efff21 (patch)
tree7ba64f6b02c7f5f0d7d005bc15f7cb729ddf2815 /lib/router.php
parent9b372f5bb7638d5d9b4e48ae425d921bc8559235 (diff)
parent9ed117dc3a405175359d0a541dddfb14cdf15d47 (diff)
Merge branch 'oembed-provider' 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 e12138637..bf3895bf0 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -113,6 +113,11 @@ class Router
$m->connect('main/tagother/:id', array('action' => 'tagother'));
+ $m->connect('main/:method',
+ array('action' => 'api',
+ 'method' => 'oembed(.xml|.json)?',
+ 'apiaction' => 'oembed'));
+
// these take a code
foreach (array('register', 'confirmaddress', 'recoverpassword') as $c) {
@@ -394,6 +399,10 @@ class Router
array('action' => 'api',
'apiaction' => 'laconica'));
+ $m->connect('api/laconica/:method',
+ array('action' => 'api',
+ 'apiaction' => 'laconica'));
+
// Groups
$m->connect('api/laconica/groups/:method/:argument',
array('action' => 'api',