jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394432 )

Change subject: Unserialize compact diff when it's string not array
......................................................................


Unserialize compact diff when it's string not array

Bug: T181760
Change-Id: Idac3c907944eee1b748e9d6c72de9111acccb6d2
---
M lib/includes/Changes/EntityChange.php
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Ladsgroup: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/includes/Changes/EntityChange.php 
b/lib/includes/Changes/EntityChange.php
index c10438b..9c6755c 100644
--- a/lib/includes/Changes/EntityChange.php
+++ b/lib/includes/Changes/EntityChange.php
@@ -374,7 +374,9 @@
                        $info['diff'] = $factory->newFromArray( $info['diff'] );
                }
 
-               if ( isset( $info['compactDiff'] ) && is_array( 
$info['compactDiff'] ) && $info['compactDiff'] ) {
+               if ( isset( $info['compactDiff'] ) && is_string( 
$info['compactDiff'] ) &&
+                       $info['compactDiff']
+               ) {
                        $compactDiff = ( new EntityDiffChangedAspectsFactory() 
)->newFromEntityDiff(
                                new Diff()
                        );

-- 
To view, visit https://gerrit.wikimedia.org/r/394432
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idac3c907944eee1b748e9d6c72de9111acccb6d2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup <ladsgr...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgr...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to