Merge pull request #1197 from simplesamlphp/admin-ui

Fix Admin UI glitch

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;
                     }
                 }
             }