From ddc1b8a64b2d8e13de0db0e18718e911bc51e936 Mon Sep 17 00:00:00 2001 From: BertKoor Date: Wed, 21 Jan 2026 16:09:31 +0100 Subject: [PATCH] fix #4828: generation of _UID when mandatory is responsibility of GedcomImportService. PafUid->canonical should NOT generate a value, even when absent. _UID tag made hidden for OBJE, REPO & SOUR. --- app/Elements/PafUid.php | 3 +-- app/Gedcom.php | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/Elements/PafUid.php b/app/Elements/PafUid.php index bb081944eae..2fad5c246a4 100644 --- a/app/Elements/PafUid.php +++ b/app/Elements/PafUid.php @@ -41,8 +41,7 @@ public function canonical(string $value): string return $value . Registry::idFactory()->pafUidChecksum($value); } - - return Registry::idFactory()->pafUid(); + return $value; } public function edit(string $id, string $name, string $value, Tree $tree): string diff --git a/app/Gedcom.php b/app/Gedcom.php index c99d06c1e2a..a7c1c31e601 100644 --- a/app/Gedcom.php +++ b/app/Gedcom.php @@ -998,12 +998,12 @@ private function webtreesSubTags(): array 'NOTE' => [['RESN', '0:1', 'CHAN']], 'NOTE:CHAN' => [['_WT_USER', '0:1']], 'NOTE:SOUR:DATA' => [['TEXT', '0:1']], - 'OBJE' => [['RESN', '0:1', 'CHAN'], ['_UID', '0:M']], + 'OBJE' => [['RESN', '0:1', 'CHAN'], ['_UID', '0:M:?']], 'OBJE:CHAN' => [['_WT_USER', '0:1']], 'OBJE:SOUR:DATA' => [['TEXT', '0:1']], - 'REPO' => [['RESN', '0:1', 'CHAN'], ['_UID', '0:M']], + 'REPO' => [['RESN', '0:1', 'CHAN'], ['_UID', '0:M:?']], 'REPO:CHAN' => [['_WT_USER', '0:1']], - 'SOUR' => [['RESN', '0:1', 'CHAN'], ['_UID', '0:M']], + 'SOUR' => [['RESN', '0:1', 'CHAN'], ['_UID', '0:M:?']], 'SOUR:CHAN' => [['_WT_USER', '0:1']], 'SUBM' => [['RESN', '0:1', 'CHAN']], 'SUBM:CHAN' => [['_WT_USER', '0:1']],