Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/router.php b/lib/router.php
index 8e4836497..e10d484f4 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -129,11 +129,6 @@ class Router
             $m->connect('index.php?action=' . $action, array('action' => $action));
         }
 
-        $m->connect('main/:method',
-                    array('action' => 'api',
-                          'method' => 'oembed(.xml|.json)?',
-                          'apiaction' => 'oembed'));
-
         // settings
 
         foreach (array('profile', 'avatar', 'password', 'openid', 'im',
@@ -480,6 +475,11 @@ class Router
 
         Event::handle('RouterInitialized', array($m));
 
+        $m->connect('main/:method',
+                    array('action' => 'api',
+                          'method' => 'oembed(.xml|.json)?',
+                          'apiaction' => 'oembed'));
+
         return $m;
     }