summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-07-30 16:25:38 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-07-30 16:25:38 -0400
commit7292c1aa784dc2213305253a96c97cc39472cccb (patch)
tree43b872adc55105add84e9ed6446b68959d341b4d /lib
parentae81d361374641ce5cd73b353fae613711e145fe (diff)
parent15848a815efa00d89c0daa7abf340ec899059f8f (diff)
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
Diffstat (limited to 'lib')
-rw-r--r--lib/router.php15
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/router.php b/lib/router.php
index e10d484f4..19839b997 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -113,6 +113,16 @@ class Router
$m->connect('main/tagother/:id', array('action' => 'tagother'));
+ $m->connect('main/oembed.xml',
+ array('action' => 'api',
+ 'method' => 'oembed.xml',
+ 'apiaction' => 'oembed'));
+
+ $m->connect('main/oembed.json',
+ array('action' => 'api',
+ 'method' => 'oembed.json',
+ 'apiaction' => 'oembed'));
+
// these take a code
foreach (array('register', 'confirmaddress', 'recoverpassword') as $c) {
@@ -475,11 +485,6 @@ class Router
Event::handle('RouterInitialized', array($m));
- $m->connect('main/:method',
- array('action' => 'api',
- 'method' => 'oembed(.xml|.json)?',
- 'apiaction' => 'oembed'));
-
return $m;
}