jenkins-bot has submitted this change and it was merged.
Change subject: Use CacheOutput::unsetProperty
......................................................................
Use CacheOutput::unsetProperty
This depends on I29af31918c48a1225b6487c74fd638de26f07b28.
Change-Id: Id3658228ec3233c92f5acbff7a5112563668ad34
---
M client/includes/EntityIdPropertyUpdater.php
1 file changed, 2 insertions(+), 22 deletions(-)
Approvals:
WikidataJenkins: Verified
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/includes/EntityIdPropertyUpdater.php
b/client/includes/EntityIdPropertyUpdater.php
index e515244..73f32ac 100644
--- a/client/includes/EntityIdPropertyUpdater.php
+++ b/client/includes/EntityIdPropertyUpdater.php
@@ -54,31 +54,11 @@
if ( $itemId instanceof EntityId ) {
$out->setProperty( 'wikibase_item',
$itemId->getSerialization() );
} else {
- // unset property, if it was set
- $this->unsetProperty( $out, 'wikibase_item' );
+ $out->unsetProperty( 'wikibase_item' );
wfDebugLog( __CLASS__, __FUNCTION__ . ': Trying to set
wikibase_item property for '
. $siteLink->getSiteId() . ':' .
$siteLink->getPageName()
- . " but $itemId is not an EntityId object." );
- }
- }
-
- /**
- * Unsets the wikibase_item property
- * @todo: should use functionality in core, and if not exists, add it
there.
- *
- * @since 0.4
- *
- * @param ParserOutput $out
- * @param string $propertyName
- */
- private function unsetProperty( \ParserOutput $out, $propertyName ) {
- // unset property, if it was set
- $properties = $out->getProperties();
-
- if ( array_key_exists( $propertyName, $properties ) ) {
- unset( $properties[$propertyName] );
- $out->mProperties = $properties;
+ . ' but $itemId ' . $itemId . ' is not an
EntityId object.' );
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/126220
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id3658228ec3233c92f5acbff7a5112563668ad34
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang <[email protected]>
Gerrit-Reviewer: Adrian Lang <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: WikidataJenkins <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
