eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Evan Prodromou 2009-07-30 16:25:38 -04:00
commit 7292c1aa78
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/router.php
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;
} }