wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Browse Source
This commit is contained in:
Sarven Capadisli 2009-11-02 10:28:57 +00:00
commit 412052cd7e
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/router.php
View File

@ -360,11 +360,6 @@ class Router
'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)'));
$m->connect('api/users/:method',
array('action' => 'api',
'apiaction' => 'users'),
array('method' => 'show(\.(xml|json))?'));
// direct messages
$m->connect('api/direct_messages.:format',
@ -459,13 +454,6 @@ class Router
array('action' => 'ApiFavoriteDestroy',
'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)'));
// notifications
$m->connect('api/notifications/:method/:argument',
array('action' => 'api',
'apiaction' => 'favorites'));
// blocks
$m->connect('api/blocks/create/:id.:format',