From 71c8330e5af938991fd02954e60631895b660628 Mon Sep 17 00:00:00 2001 From: Tim van Dijen Date: Fri, 6 Sep 2019 14:36:30 +0200 Subject: [PATCH 1/2] Fix untranslatables Resort to entityid --- modules/admin/lib/FederationController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/admin/lib/FederationController.php b/modules/admin/lib/FederationController.php index b9ee3b4ebb..6c45d7fe04 100644 --- a/modules/admin/lib/FederationController.php +++ b/modules/admin/lib/FederationController.php @@ -118,7 +118,9 @@ public function main() } elseif (isset($entity[$old]['en'])) { $entries['remote'][$key][$entityid][$new] = $entity[$old]['en']; } elseif (isset($entries['remote'][$key][$entityid][$old])) { - $entries['remote'][$key][$entityid][$new] = $entries['remote'][$key][$entityid][$old]; + $old_entry = $entries['remote'][$key][$entityid][$old]; + $entries['remote'][$key][$entityid][$new] = is_array($old_entry) ? $entityid : $old_entry; + //$entries['remote'][$key][$entityid][$new] = $entries['remote'][$key][$entityid][$old]; } } } From 2def4b5cf97413af45258be0d90e5a1d48cc5362 Mon Sep 17 00:00:00 2001 From: Tim van Dijen Date: Fri, 6 Sep 2019 16:13:44 +0200 Subject: [PATCH 2/2] Cleanup --- modules/admin/lib/FederationController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/admin/lib/FederationController.php b/modules/admin/lib/FederationController.php index 6c45d7fe04..fb83c2e627 100644 --- a/modules/admin/lib/FederationController.php +++ b/modules/admin/lib/FederationController.php @@ -120,7 +120,6 @@ public function main() } elseif (isset($entries['remote'][$key][$entityid][$old])) { $old_entry = $entries['remote'][$key][$entityid][$old]; $entries['remote'][$key][$entityid][$new] = is_array($old_entry) ? $entityid : $old_entry; - //$entries['remote'][$key][$entityid][$new] = $entries['remote'][$key][$entityid][$old]; } } }