Fix for ticket #2532: fixed API block create/destroy when specifying the target user...

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.

diff --git a/lib/router.php b/lib/router.php
index ab8c40668ddb5eca4da2182419933d771f095c0d..9aaac7dfe39cb8cbc051ed264868a545b3e8fb0f 100644 (file)
--- a/lib/router.php
+++ b/lib/router.php
@@ -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]+',