Fix the router entries for the oEmbed endpoint so they don't accidentally catch too much

This commit is contained in:
Craig Andrews 2009-07-30 15:37:35 -04:00
parent 63e8f15448
commit 15848a815e

View File

@ -113,6 +113,16 @@ class Router
$m->connect('main/tagother/:id', array('action' => 'tagother')); $m->connect('main/tagother/:id', array('action' => 'tagother'));
$m->connect('main/oembed.xml',
array('action' => 'api',
'method' => 'oembed.xml',
'apiaction' => 'oembed'));
$m->connect('main/oembed.json',
array('action' => 'api',
'method' => 'oembed.json',
'apiaction' => 'oembed'));
// these take a code // these take a code
foreach (array('register', 'confirmaddress', 'recoverpassword') as $c) { foreach (array('register', 'confirmaddress', 'recoverpassword') as $c) {
@ -475,11 +485,6 @@ class Router
Event::handle('RouterInitialized', array($m)); Event::handle('RouterInitialized', array($m));
$m->connect('main/:method',
array('action' => 'api',
'method' => 'oembed(.xml|.json)?',
'apiaction' => 'oembed'));
return $m; return $m;
} }