Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/228884
Change subject: Update Wikidata - fix T104609 and partial fix/debug for T107711 ...................................................................... Update Wikidata - fix T104609 and partial fix/debug for T107711 Change-Id: I1f147ea73dbb3a8cb9b45b5cb74d050e0924aa2c --- M composer.lock M extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php M extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php M vendor/composer/installed.json 4 files changed, 22 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata refs/changes/84/228884/1 diff --git a/composer.lock b/composer.lock index 07b433d..e91a4b3 100644 --- a/composer.lock +++ b/composer.lock @@ -1325,7 +1325,7 @@ "source": { "type": "git", "url": "https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Wikibase.git", - "reference": "62e6fe44a874c861679bee3b0f1181d1e05c3f0b" + "reference": "df3ee5839415d20ab85ae4069b0cc2f8eda4a8a1" }, "require": { "data-values/common": "~0.2.0", @@ -1403,7 +1403,7 @@ "issues": "https://phabricator.wikimedia.org/", "irc": "irc://irc.freenode.net/wikidata" }, - "time": "2015-07-31 01:14:29" + "time": "2015-08-03 18:51:54" }, { "name": "wikibase/wikimedia-badges", diff --git a/extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php b/extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php index 0c625cd..5a21988 100644 --- a/extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php +++ b/extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php @@ -3,7 +3,9 @@ namespace Wikibase\DataAccess\PropertyParserFunction; use Language; +use MWException; use Parser; +use StubUserLang; use ValueFormatters\FormatterOptions; use Wikibase\Client\Usage\ParserOutputUsageAccumulator; use Wikibase\Client\Usage\UsageAccumulator; @@ -94,12 +96,23 @@ } /** - * @param Language $language + * @param Language|StubUserLang $language * @param UsageAccumulator $usageAccumulator * * @return LanguageAwareRenderer + * @throws MWException */ - private function newLanguageAwareRenderer( Language $language, UsageAccumulator $usageAccumulator ) { + private function newLanguageAwareRenderer( $language, UsageAccumulator $usageAccumulator ) { + if ( !$language instanceof Language ) { + wfDebugLog( + 'T107711', + get_class( $language ) . ' is not a Language object.', + 'all', + array( 'trace' => wfDebugBacktrace() ) + ); + } + StubUserLang::unstub( $language ); + $entityStatementsRenderer = new StatementTransclusionInteractor( $language, $this->propertyIdResolver, diff --git a/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php b/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php index 7f25247..529ed2e 100644 --- a/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php +++ b/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php @@ -199,10 +199,11 @@ // set the display title //$parserOutput->setTitleText( $entity>getLabel( $langCode ) ); + // Sometimes extensions like SpamBlacklist might call getParserOutput + // before the id is assigned, during the process of creating a new entity. + // in that case, no alternate links are added, which probably is no problem. if ( $entity->getId() !== null ) { $this->addAlternateLinks( $parserOutput, $entity->getId() ); - } else { - wfLogWarning( "Encountered an Entity without EntityId in EntityParserOutputGenerator." ); } return $parserOutput; diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index b702e08..c94a430 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1417,7 +1417,7 @@ "source": { "type": "git", "url": "https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Wikibase.git", - "reference": "62e6fe44a874c861679bee3b0f1181d1e05c3f0b" + "reference": "df3ee5839415d20ab85ae4069b0cc2f8eda4a8a1" }, "require": { "data-values/common": "~0.2.0", @@ -1446,7 +1446,7 @@ "require-dev": { "squizlabs/php_codesniffer": "~2.1" }, - "time": "2015-07-31 00:21:34", + "time": "2015-08-03 18:29:29", "type": "mediawiki-extension", "installation-source": "source", "autoload": { -- To view, visit https://gerrit.wikimedia.org/r/228884 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1f147ea73dbb3a8cb9b45b5cb74d050e0924aa2c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikidata Gerrit-Branch: wmf/1.26wmf16 Gerrit-Owner: Aude <aude.w...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits