summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-07-17 14:26:34 -0700
committerZach Copley <zach@controlyourself.ca>2009-07-17 14:26:34 -0700
commit3474a0f04edfc683d1bfa43c540947083c18a1d2 (patch)
tree56abb176656f66d5e490f57a66d8ae09bdbb89cd
parent44f3f2bd2af07b6fb5eb8f2516e137e89db7d4a4 (diff)
parentf0d17afc7b69308b27dc48a43ed08947885d8225 (diff)
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
-rw-r--r--lib/router.php10
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',