diff --git a/app/controller/admin.php b/app/controller/admin.php index 137124103e515169fed76f944158b2351296ee83..d27feec8d592854b56a01a4c2ec6a90c493d0200 100644 --- a/app/controller/admin.php +++ b/app/controller/admin.php @@ -886,7 +886,7 @@ class Admin extends Controller $id = array_key_exists('id', $args) ? \Utils::asl($args['id']) : ''; $f3->set('id', $id); - if($f3->get('VERB') == 'GET') { + if ($f3->get('VERB') == 'GET') { $merger = $f3->get('container')['user_finder']->findById($id); $email_merged = \Utils::asl($f3->get('GET.merged')); $user = $f3->get('container')['user_finder']->findById($id); @@ -905,7 +905,7 @@ class Admin extends Controller $f3->set('donations', $donations); $f3->set('block_content', 'backend/fusion_user.html'); - } else if($f3->get('VERB') == 'POST') { + } elseif ($f3->get('VERB') == 'POST') { $merger_id = \Utils::asl($f3->get('POST.merger_id')); $merged_id = \Utils::asl($f3->get('POST.merged_id')); @@ -914,12 +914,14 @@ class Admin extends Controller $merged = $f3->get('container')['user_finder']->findById($merged_id); // Update total and cumul values - $f3->get('container')['command_handler']->handle(new UserUpdateByAdminCommand($merger_id, + $f3->get('container')['command_handler']->handle(new UserUpdateByAdminCommand( + $merger_id, $merger['pseudo'], $merger['email'], $merger['commentaire'] + $merged['commentaire'], (int) $merger['total'] + (int) $merged['total'], - (int) $merger['cumul'] + (int) $merged['cumul'])); + (int) $merger['cumul'] + (int) $merged['cumul'] + )); $db = $f3->get('DB'); // Now, let's change all counterparts of merged