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

* '0.8.x' of git@gitorious.org:laconica/mainline:
  Moved oembed endpointer so openid no longer incorrectly prompts for authentication

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/router.php b/lib/router.php
index bf3895bf0..5e0fcfc94 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -113,11 +113,6 @@ 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) {
@@ -134,6 +129,11 @@ 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',