diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-22 13:51:28 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-22 13:51:28 -0700 |
| commit | 2d124e4aabdc2f4c5a30c5b0b087bbfa1e7bac7b (patch) | |
| tree | 8c768d5976059a0da5c1cbd263e597e97a9047d0 | |
| parent | 783f28c8b196bb22632c25f0007281be1449b0be (diff) | |
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.
| -rw-r--r-- | lib/router.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/router.php b/lib/router.php index ab8c40668..9aaac7dfe 100644 --- 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]+', |