GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

Browse Source 
* '0.8.x' of git@gitorious.org:laconica/mainline:
  Moved oembed endpointer so openid no longer incorrectly prompts for authentication
This commit is contained in:
Zach Copley 2009-07-17 14:26:34 -07:00
commit 3474a0f04e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/router.php
View File

@ -113,11 +113,6 @@ class Router
$m->connect('main/tagother/:id', array('action' => 'tagother')); $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 // these take a code
foreach (array('register', 'confirmaddress', 'recoverpassword') as $c) { foreach (array('register', 'confirmaddress', 'recoverpassword') as $c) {
@ -134,6 +129,11 @@ class Router
$m->connect('index.php?action=' . $action, array('action' => $action)); $m->connect('index.php?action=' . $action, array('action' => $action));
} }
$m->connect('main/:method',
array('action' => 'api',
'method' => 'oembed(.xml|.json)?',
'apiaction' => 'oembed'));
// settings // settings
foreach (array('profile', 'avatar', 'password', 'openid', 'im', foreach (array('profile', 'avatar', 'password', 'openid', 'im',