diff --git a/modules/admin/lib/FederationController.php b/modules/admin/lib/FederationController.php index b9ee3b4ebb82fb82e89ea294d7099f14f268a1c0..fb83c2e6279b48c33825c6a548ee39a96486033f 100644 --- a/modules/admin/lib/FederationController.php +++ b/modules/admin/lib/FederationController.php @@ -118,7 +118,8 @@ class FederationController } 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; } } }