move oEmbed router connection after plugins, so other endpoints (such as main/facebooklogin) from plugins don't get accidentally intercepted

This commit is contained in:
Craig Andrews 2009-07-29 15:33:09 -04:00
parent f3352254b7
commit 6b48fd8f86

View File

@ -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;
}