jenkins-bot has submitted this change and it was merged.
Change subject: Allow runSearch.php to accept non-atomic JSON --options
......................................................................
Allow runSearch.php to accept non-atomic JSON --options
Tell json_decode to return an array rather than an object.
Bug: T126060
Change-Id: I3ad7db2207e68719b4d88e8910f4fd973ad2a100
---
M maintenance/runSearch.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/runSearch.php b/maintenance/runSearch.php
index 32c7894..51b0938 100644
--- a/maintenance/runSearch.php
+++ b/maintenance/runSearch.php
@@ -81,7 +81,7 @@
* to override current settings.
*/
protected function applyGlobals() {
- $options = json_decode( $this->getOption( 'options', 'false' )
);
+ $options = json_decode( $this->getOption( 'options', 'false' ),
true );
if ( $options ) {
foreach ( $options as $key => $value ) {
if ( array_key_exists( $key, $GLOBALS ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/268738
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ad7db2207e68719b4d88e8910f4fd973ad2a100
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Tjones <[email protected]>
Gerrit-Reviewer: Cindy-the-browser-test-bot <[email protected]>
Gerrit-Reviewer: DCausse <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Manybubbles <[email protected]>
Gerrit-Reviewer: Smalyshev <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
