jenkins-bot has submitted this change and it was merged.
Change subject: Avro payload can only contain string values
......................................................................
Avro payload can only contain string values
Bug: T123541
Change-Id: I04f3157a20a21d7013c1b56f6b1747f9cd23699e
(cherry picked from commit fe33be62698276852be4a246d97a4e33a357fcc7)
---
M includes/ElasticsearchIntermediary.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Smalyshev: Looks good to me, but someone else must approve
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/ElasticsearchIntermediary.php
b/includes/ElasticsearchIntermediary.php
index 0840ce5..493d5c0 100644
--- a/includes/ElasticsearchIntermediary.php
+++ b/includes/ElasticsearchIntermediary.php
@@ -178,7 +178,7 @@
}
}
if ( !empty( $context['langdetect' ] ) ) {
- $request['payload']['langdetect'] =
$context['langdetect'];
+ $request['payload']['langdetect'] = (string)
$context['langdetect'];
}
$requests[] = $request;
}
@@ -211,9 +211,9 @@
'backendUserTests' =>
UserTesting::getInstance()->getActiveTestNamesWithBucket(),
'payload' => array(
// may want to promote this to a top level var
at some point
- 'tookMs' => intval( 1000 * $tookS ),
+ 'tookMs' => (string) intval( 1000 * $tookS ),
// useful while we are testing accept-lang
based interwiki
- 'acceptLang' => $wgRequest->getHeader(
'Accept-Language' ) ?: '',
+ 'acceptLang' => (string)
($wgRequest->getHeader( 'Accept-Language' ) ?: ''),
),
'requests' => $requests,
);
--
To view, visit https://gerrit.wikimedia.org/r/264989
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I04f3157a20a21d7013c1b56f6b1747f9cd23699e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: wmf/1.27.0-wmf.10
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: DCausse <[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
