forked from GNUsocial/gnu-social
Fix for ticket #2532: fixed API block create/destroy when specifying the target user/profile as a separate query parameter, such as api/blocks/create.xml?param=xxx
The router settings weren't quite right so we ended up with bogus regex values passed in as the 'id' parameter, which broke the regular fallback ordering of parameter checks.
This commit is contained in:
parent
783f28c8b1
commit
2d124e4aab
@ -551,11 +551,19 @@ class Router
|
||||
'format' => '(xml|json)'));
|
||||
// blocks
|
||||
|
||||
$m->connect('api/blocks/create.:format',
|
||||
array('action' => 'ApiBlockCreate',
|
||||
'format' => '(xml|json)'));
|
||||
|
||||
$m->connect('api/blocks/create/:id.:format',
|
||||
array('action' => 'ApiBlockCreate',
|
||||
'id' => '[a-zA-Z0-9]+',
|
||||
'format' => '(xml|json)'));
|
||||
|
||||
$m->connect('api/blocks/destroy.:format',
|
||||
array('action' => 'ApiBlockDestroy',
|
||||
'format' => '(xml|json)'));
|
||||
|
||||
$m->connect('api/blocks/destroy/:id.:format',
|
||||
array('action' => 'ApiBlockDestroy',
|
||||
'id' => '[a-zA-Z0-9]+',
|
||||
|
Loading…
Reference in New Issue
Block a user