jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/395850 )
Change subject: Make EntityChange truly forward compatible with compact diffs ...................................................................... Make EntityChange truly forward compatible with compact diffs This part was taken from: https://gerrit.wikimedia.org/r/#/c/393791/5/lib/includes/Changes/EntityChange.php and I also applied fa26a00ca113b112b029b11541ba68aa1e945ec4. Bug: T182243 Change-Id: Ic426abde22c5cd53db1390a3ba962a1b03946423 --- M lib/includes/Changes/EntityChange.php 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/includes/Changes/EntityChange.php b/lib/includes/Changes/EntityChange.php index 9c62ac9..8180cdd 100644 --- a/lib/includes/Changes/EntityChange.php +++ b/lib/includes/Changes/EntityChange.php @@ -3,6 +3,7 @@ namespace Wikibase; use Deserializers\Deserializer; +use Diff\DiffOp\Diff\Diff; use Diff\DiffOp\DiffOp; use Diff\DiffOpFactory; use MWException; @@ -16,6 +17,7 @@ use Wikibase\DataModel\Entity\BasicEntityIdParser; use Wikibase\DataModel\Services\Diff\EntityTypeAwareDiffOpFactory; use Wikibase\DataModel\Statement\Statement; +use Wikibase\Lib\Changes\EntityDiffChangedAspectsFactory; use Wikibase\Repo\WikibaseRepo; /** @@ -363,6 +365,16 @@ $info['diff'] = $factory->newFromArray( $info['diff'] ); } + if ( isset( $info['compactDiff'] ) && is_string( $info['compactDiff'] ) && + $info['compactDiff'] + ) { + $compactDiff = ( new EntityDiffChangedAspectsFactory() )->newFromEntityDiff( + new Diff() + ); + $compactDiff->unserialize( $info['compactDiff'] ); + $info['compactDiff'] = $compactDiff; + } + return $info; } -- To view, visit https://gerrit.wikimedia.org/r/395850 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic426abde22c5cd53db1390a3ba962a1b03946423 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: wmf/1.31.0-wmf.10 Gerrit-Owner: Hoo man <h...@online.de> Gerrit-Reviewer: Hoo man <h...@online.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
