Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/209160
Change subject: Update Wikidata - fix api error output when parsing values ...................................................................... Update Wikidata - fix api error output when parsing values and elsewhere this is used by the Wikibase api Change-Id: Ibf054807644f42b425b9bc7bba043f61a5fba990 --- M composer.lock M extensions/Wikibase/repo/includes/api/ApiErrorReporter.php M vendor/composer/installed.json 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata refs/changes/60/209160/1 diff --git a/composer.lock b/composer.lock index 975015b..1b7223d 100644 --- a/composer.lock +++ b/composer.lock @@ -1213,7 +1213,7 @@ "source": { "type": "git", "url": "https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git", - "reference": "eedce83fe41a299f242c2933e23bbbc8ce2dc944" + "reference": "b83449d82ca0a5f2fb890e37ef76bb3d0075d463" }, "require": { "data-values/common": "~0.2.0", @@ -1283,7 +1283,7 @@ "issues": "https://bugzilla.wikimedia.org/", "irc": "irc://irc.freenode.net/wikidata" }, - "time": "2015-05-05 19:13:08" + "time": "2015-05-06 01:04:37" }, { "name": "wikibase/wikimedia-badges", diff --git a/extensions/Wikibase/repo/includes/api/ApiErrorReporter.php b/extensions/Wikibase/repo/includes/api/ApiErrorReporter.php index 9ad77b5..002503e 100644 --- a/extensions/Wikibase/repo/includes/api/ApiErrorReporter.php +++ b/extensions/Wikibase/repo/includes/api/ApiErrorReporter.php @@ -440,7 +440,7 @@ ApiResult::setIndexedTagName( $row['parameters'], 'parameter' ); $html = $this->forceMessageLanguage( $message, $this->language )->useDatabase( true )->parse(); - ApiResult::setContentValue( $row, 'html', $html ); + ApiResult::setValue( $row, 'html', $html ); $row[ApiResult::META_BC_SUBELEMENTS][] = 'html'; return $row; diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 6de4ea1..7d9ed3e 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1303,7 +1303,7 @@ "source": { "type": "git", "url": "https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git", - "reference": "eedce83fe41a299f242c2933e23bbbc8ce2dc944" + "reference": "b83449d82ca0a5f2fb890e37ef76bb3d0075d463" }, "require": { "data-values/common": "~0.2.0", @@ -1329,7 +1329,7 @@ "conflict": { "mediawiki/mediawiki": "<1.23" }, - "time": "2015-05-05 18:50:37", + "time": "2015-05-05 20:16:30", "type": "mediawiki-extension", "installation-source": "source", "autoload": { -- To view, visit https://gerrit.wikimedia.org/r/209160 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf054807644f42b425b9bc7bba043f61a5fba990 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikidata Gerrit-Branch: wmf/1.26wmf4 Gerrit-Owner: Aude <aude.w...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits