Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/192974
Change subject: Update Wikibase to fix EntityViewPlaceholderExpander
......................................................................
Update Wikibase to fix EntityViewPlaceholderExpander
Change-Id: I8729a6e01b6dd84bd9cf84916821a56fba18e097
---
M composer.lock
M extensions/Wikibase/repo/includes/View/EntityViewPlaceholderExpander.php
M vendor/composer/installed.json
3 files changed, 13 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/74/192974/1
diff --git a/composer.lock b/composer.lock
index 50f7960..7249ff8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1234,12 +1234,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "fe4ad3f482352baf317a537fd1f55628bf7e2054"
+ "reference": "07c8c09280a80d597ea650fef0510c19c219d41d"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/fe4ad3f482352baf317a537fd1f55628bf7e2054";,
- "reference": "fe4ad3f482352baf317a537fd1f55628bf7e2054",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/07c8c09280a80d597ea650fef0510c19c219d41d";,
+ "reference": "07c8c09280a80d597ea650fef0510c19c219d41d",
"shasum": ""
},
"require": {
@@ -1306,7 +1306,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2015-02-25 14:13:29"
+ "time": "2015-02-25 22:37:05"
},
{
"name": "wikibase/wikimedia-badges",
diff --git
a/extensions/Wikibase/repo/includes/View/EntityViewPlaceholderExpander.php
b/extensions/Wikibase/repo/includes/View/EntityViewPlaceholderExpander.php
index 7f4bbcf..f4f3551 100644
--- a/extensions/Wikibase/repo/includes/View/EntityViewPlaceholderExpander.php
+++ b/extensions/Wikibase/repo/includes/View/EntityViewPlaceholderExpander.php
@@ -241,16 +241,18 @@
try {
// we may want to cache this...
$entityRev =
$this->entityRevisionLookup->getEntityRevision( $entityId, $revisionId );
- $entity = $entityRev->getEntity();
} catch ( StorageException $ex ) {
- // could not load entity, might be a deleted revision
+ // Could not load entity revision, $revisionId might be
a deleted revision
return '';
}
- if ( !$entity ) {
+ if ( !$entityRev ) {
+ // Could not load entity revision, $revisionId might be
a non-entity revision
return '';
}
+ $entity = $entityRev->getEntity();
+
$termBoxView = new TermBoxView( $this->templateFactory,
$this->uiLanguage );
$html = $termBoxView->renderTermBox( $this->targetPage,
$entity->getFingerprint(), $languages );
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 52d2db8..e2b271f 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1326,12 +1326,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "fe4ad3f482352baf317a537fd1f55628bf7e2054"
+ "reference": "07c8c09280a80d597ea650fef0510c19c219d41d"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/fe4ad3f482352baf317a537fd1f55628bf7e2054";,
- "reference": "fe4ad3f482352baf317a537fd1f55628bf7e2054",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/07c8c09280a80d597ea650fef0510c19c219d41d";,
+ "reference": "07c8c09280a80d597ea650fef0510c19c219d41d",
"shasum": ""
},
"require": {
@@ -1359,7 +1359,7 @@
"conflict": {
"mediawiki/mediawiki": "<1.23"
},
- "time": "2015-02-25 14:13:29",
+ "time": "2015-02-25 22:37:05",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/192974
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8729a6e01b6dd84bd9cf84916821a56fba18e097
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.25wmf19
Gerrit-Owner: Hoo man <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
