From 915f57db994f67f1ce00a924a0579e6eb8d57333 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 8 Mar 2023 14:16:14 +0100 Subject: [PATCH] DirectorDatafield: ignore uuid and originalId... ...on diff --- library/Director/Objects/DirectorDatafield.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/library/Director/Objects/DirectorDatafield.php b/library/Director/Objects/DirectorDatafield.php index 7a09c7a6..19581f0f 100644 --- a/library/Director/Objects/DirectorDatafield.php +++ b/library/Director/Objects/DirectorDatafield.php @@ -169,6 +169,8 @@ class DirectorDatafield extends DbObjectWithSettings foreach ($candidates as $candidate) { $export = $candidate->export(); CompareBasketObject::normalize($export); + unset($export->uuid); + unset($plain->originalId); if (CompareBasketObject::equals($export, $plain)) { return $candidate; }