jenkins-bot has submitted this change and it was merged.
Change subject: (bug 55861) Better error message for invalid params parameter.
......................................................................
(bug 55861) Better error message for invalid params parameter.
Also switch around dieUsage() uses to the correct param order
Change-Id: I6ff1a03af3280451dff773eb61310324b5e80bbc
---
M includes/api/ApiFlow.php
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, but someone else must approve
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiFlow.php b/includes/api/ApiFlow.php
index 68df1e8..a66a6a9 100644
--- a/includes/api/ApiFlow.php
+++ b/includes/api/ApiFlow.php
@@ -9,7 +9,7 @@
$output = array();
if ( ! $params['workflow'] && ! $params['page'] ) {
- $this->dieUsage( 'missing-param', 'One of workflow or
page parameters must be provided' );
+ $this->dieUsage( 'One of workflow or page parameters
must be provided', 'badparams' );
return;
}
@@ -24,6 +24,12 @@
->createWorkflowLoader( $page, $id );
$requestParams = json_decode( $params['params'], true );
+
+ if ( ! $requestParams ) {
+ $this->dieUsage( 'The params parameter must be a valid
JSON string', 'badparams' );
+ return;
+ }
+
$request = new DerivativeRequest(
$this->getContext()->getRequest(), $requestParams, true );
$blocks = $this->loader->createBlocks();
--
To view, visit https://gerrit.wikimedia.org/r/91551
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ff1a03af3280451dff773eb61310324b5e80bbc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Werdna <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
