Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222028
Change subject: Update Wikibase, fix EntityParserOutputGenerator
......................................................................
Update Wikibase, fix EntityParserOutputGenerator
Contains: 6c689be62b9541d81c459034c5bf09e2f38ead5b
Change-Id: I2a119c5d2e78bdddeef68df7ccbda106f5b2beeb
---
M composer.lock
M extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
M vendor/composer/installed.json
3 files changed, 13 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/28/222028/1
diff --git a/composer.lock b/composer.lock
index 04ee4ad..4c46b2c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1326,12 +1326,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "34209ffd6d69f5150de9146ebe27eb700c9d06ce"
+ "reference": "6c689be62b9541d81c459034c5bf09e2f38ead5b"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/34209ffd6d69f5150de9146ebe27eb700c9d06ce";,
- "reference": "34209ffd6d69f5150de9146ebe27eb700c9d06ce",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/6c689be62b9541d81c459034c5bf09e2f38ead5b";,
+ "reference": "6c689be62b9541d81c459034c5bf09e2f38ead5b",
"shasum": ""
},
"require": {
@@ -1399,7 +1399,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2015-06-30 01:40:22"
+ "time": "2015-06-30 22:51:05"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
b/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
index 02d5ca1..a5f2ce4 100644
--- a/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
+++ b/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
@@ -200,7 +200,11 @@
// set the display title
//$parserOutput->setTitleText( $entity>getLabel( $langCode ) );
- $this->addAlternateLinks( $parserOutput, $entity->getId() );
+ 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 b1386f0..154f9f4 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1420,12 +1420,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "34209ffd6d69f5150de9146ebe27eb700c9d06ce"
+ "reference": "6c689be62b9541d81c459034c5bf09e2f38ead5b"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/34209ffd6d69f5150de9146ebe27eb700c9d06ce";,
- "reference": "34209ffd6d69f5150de9146ebe27eb700c9d06ce",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/6c689be62b9541d81c459034c5bf09e2f38ead5b";,
+ "reference": "6c689be62b9541d81c459034c5bf09e2f38ead5b",
"shasum": ""
},
"require": {
@@ -1455,7 +1455,7 @@
"require-dev": {
"squizlabs/php_codesniffer": "~2.1"
},
- "time": "2015-06-30 01:40:22",
+ "time": "2015-06-30 22:51:05",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/222028
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a119c5d2e78bdddeef68df7ccbda106f5b2beeb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.26wmf12
Gerrit-Owner: Hoo man <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
