summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2009-07-29 15:33:09 -0400
committerCraig Andrews <candrews@integralblue.com>2009-07-29 15:33:09 -0400
commit6b48fd8f86cd4e6ee7309104bdb4e5b44b9b60c6 (patch)
treed839533c56655fdff3307de4ba989494eb770393
parentf3352254b792b201b1acaa93c9f58530c671ad11 (diff)
move oEmbed router connection after plugins, so other endpoints (such as main/facebooklogin) from plugins don't get accidentally intercepted
-rw-r--r--lib/router.php10
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;
}