jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/399983 )
Change subject: Use OutputPage::msg() instead of wfMessage in EntityDataRequestHandler ...................................................................... Use OutputPage::msg() instead of wfMessage in EntityDataRequestHandler It is failing travis: https://travis-ci.org/wikimedia/mediawiki-extensions-Wikibase/jobs/320401701 Change-Id: I6cb2822aeb914c2842947fa9ef1a9123e547cdbb --- M repo/includes/LinkedData/EntityDataRequestHandler.php 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/includes/LinkedData/EntityDataRequestHandler.php b/repo/includes/LinkedData/EntityDataRequestHandler.php index 5bad5e5..b48e4d3 100644 --- a/repo/includes/LinkedData/EntityDataRequestHandler.php +++ b/repo/includes/LinkedData/EntityDataRequestHandler.php @@ -202,20 +202,20 @@ // If there is no ID, fail if ( $id === null || $id === '' ) { //TODO: different error message? - throw new HttpError( 400, wfMessage( 'wikibase-entitydata-bad-id', $id ) ); + throw new HttpError( 400, $output->msg( 'wikibase-entitydata-bad-id', $id ) ); } try { $entityId = $this->entityIdParser->parse( $id ); } catch ( EntityIdParsingException $ex ) { - throw new HttpError( 400, wfMessage( 'wikibase-entitydata-bad-id', $id ) ); + throw new HttpError( 400, $output->msg( 'wikibase-entitydata-bad-id', $id ) ); } if ( $format === 'rdf' || $format === 'ttl' ) { if ( in_array( $entityId->getEntityType(), $this->disabledRdfExportEntityTypes ) ) { throw new HttpError( 400, - wfMessage( 'wikibase-entitydata-rdf-disabled', $entityId->getEntityType() ) + $output->msg( 'wikibase-entitydata-rdf-disabled', $entityId->getEntityType() ) ); } } @@ -344,7 +344,7 @@ if ( $format === null ) { $mimeTypes = implode( ', ', $this->entityDataFormatProvider->getSupportedMimeTypes() ); - $msg = wfMessage( 'wikibase-entitydata-not-acceptable', $mimeTypes ); + $msg = $output->msg( 'wikibase-entitydata-not-acceptable', $mimeTypes ); throw new HttpError( 406, $msg ); } -- To view, visit https://gerrit.wikimedia.org/r/399983 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6cb2822aeb914c2842947fa9ef1a9123e547cdbb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Ladsgroup <[email protected]> Gerrit-Reviewer: Addshore <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
