forked from GNUsocial/gnu-social
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
This commit is contained in:
commit
412052cd7e
@ -360,11 +360,6 @@ class Router
|
|||||||
'id' => '[a-zA-Z0-9]+',
|
'id' => '[a-zA-Z0-9]+',
|
||||||
'format' => '(xml|json)'));
|
'format' => '(xml|json)'));
|
||||||
|
|
||||||
$m->connect('api/users/:method',
|
|
||||||
array('action' => 'api',
|
|
||||||
'apiaction' => 'users'),
|
|
||||||
array('method' => 'show(\.(xml|json))?'));
|
|
||||||
|
|
||||||
// direct messages
|
// direct messages
|
||||||
|
|
||||||
$m->connect('api/direct_messages.:format',
|
$m->connect('api/direct_messages.:format',
|
||||||
@ -459,13 +454,6 @@ class Router
|
|||||||
array('action' => 'ApiFavoriteDestroy',
|
array('action' => 'ApiFavoriteDestroy',
|
||||||
'id' => '[a-zA-Z0-9]+',
|
'id' => '[a-zA-Z0-9]+',
|
||||||
'format' => '(xml|json)'));
|
'format' => '(xml|json)'));
|
||||||
|
|
||||||
// notifications
|
|
||||||
|
|
||||||
$m->connect('api/notifications/:method/:argument',
|
|
||||||
array('action' => 'api',
|
|
||||||
'apiaction' => 'favorites'));
|
|
||||||
|
|
||||||
// blocks
|
// blocks
|
||||||
|
|
||||||
$m->connect('api/blocks/create/:id.:format',
|
$m->connect('api/blocks/create/:id.:format',
|
||||||
|
Loading…
Reference in New Issue
Block a user