Fix infinite loop in some move scenarios

helper.php

@@ -738,7 +738,7 @@ protected function resolve_moves($moves, $id) {
         while($changed) {
             $changed = false;
             foreach($tmp_moves as $old => $new) {
-                if($old != $new && isset($moves[$new]) && $moves[$new] != $new) {
+                if($old != $new && isset($moves[$new]) && $moves[$new] != $new && $tmp_moves[$new] != $new) {
                     $tmp_moves[$old] = $moves[$new];
                     $changed         = true;
                 }