Merge branch 'oembed-provider' into 0.8.x

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',