jenkins-bot has submitted this change and it was merged.
Change subject: Stop using deprecated method in EntityContent and add fixme for
now obvious issue
......................................................................
Stop using deprecated method in EntityContent and add fixme for now obvious
issue
Change-Id: I7a71fc8bbde12392662189665541143156396429
---
M repo/includes/content/EntityContent.php
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/content/EntityContent.php
b/repo/includes/content/EntityContent.php
index 7b02872..364091f 100644
--- a/repo/includes/content/EntityContent.php
+++ b/repo/includes/content/EntityContent.php
@@ -23,6 +23,7 @@
use Wikibase\Content\DeferredCopyEntityHolder;
use Wikibase\Content\EntityHolder;
use Wikibase\Content\EntityInstanceHolder;
+use Wikibase\DataModel\Entity\Diff\EntityPatcher;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\StatementListProvider;
@@ -579,7 +580,10 @@
$entityAfterPatch = $this->getEntity()->copy();
}
- $entityAfterPatch->patch( $patch->getEntityDiff() );
+ // FIXME: this should either be done in the derivatives, or the
patcher
+ // should be injected, so the application can add support for
additional entity types.
+ $patcher = new EntityPatcher();
+ $patcher->patchEntity( $entityAfterPatch,
$patch->getEntityDiff() );
$redirAfterPatch = $this->getPatchedRedirect(
$patch->getRedirectDiff() );
--
To view, visit https://gerrit.wikimedia.org/r/186119
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7a71fc8bbde12392662189665541143156396429
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
