Fix: #3904 - update XREFs in blocks (e.g. stories) after merging

fisharebest · May 24, 2021 · ecc5b3c · ecc5b3c
1 parent ee51991
commit ecc5b3c
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/app/Http/RequestHandlers/MergeFactsAction.php b/app/Http/RequestHandlers/MergeFactsAction.php
@@ -101,7 +101,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
                 ), 'info');
                 $gedcom = str_replace('@' . $xref2 . '@', '@' . $xref1 . '@', $record->gedcom());
                 $gedcom = preg_replace(
-                    '/(\n1.*@.+@.*(?:(?:\n[2-9].*)*))((?:\n1.*(?:\n[2-9].*)*)*\1)/',
+                    '/(\n1.*@.+@.*(?:\n[2-9].*)*)((?:\n1.*(?:\n[2-9].*)*)*\1)/',
                     '$2',
                     $gedcom
                 );
@@ -116,6 +116,12 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             ->where('setting_value', '=', $xref2)
             ->update(['setting_value' => $xref1]);
 
+        // Merge stories, etc.
+        DB::table('block')
+            ->where('gedcom_id', '=', $tree->id())
+            ->where('xref', '=', $xref2)
+            ->update(['xref' => $xref1]);
+
         // Merge hit counters
         $hits = DB::table('hit_counter')
             ->where('gedcom_id', '=', $tree->id())