Fixed error upon user delete with no migration id

Fixes #4162

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 2fcfa4289e20ec31f47f1aa5dd52f8e461d73508..cd95f7220766fb6598567afe8ca9d2d7098ac331 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -197,7 +197,7 @@ class UserController extends Controller
         $this->checkPermissionOrCurrentUser('users-manage', $id);
 
         $user = $this->userRepo->getById($id);
         $this->checkPermissionOrCurrentUser('users-manage', $id);
 
         $user = $this->userRepo->getById($id);

-        $newOwnerId = $request->get('new_owner_id', null);
+        $newOwnerId = intval($request->get('new_owner_id')) ?: null;

 
         $this->userRepo->destroy($user, $newOwnerId);
 
 
         $this->userRepo->destroy($user, $newOwnerId);
 

diff --git a/tests/User/UserManagementTest.php b/tests/User/UserManagementTest.php
index d5cd7ac7963d671636a6b4ea12f9ca656fcfb6b7..7ccc5b773a7e88a120c4ee214a11c5c44fa44ea1 100644 (file)
--- a/tests/User/UserManagementTest.php
+++ b/tests/User/UserManagementTest.php
@@ -162,6 +162,16 @@ class UserManagementTest extends TestCase
         ]);
     }
 
         ]);
     }
 

+    public function test_delete_with_empty_owner_migration_id_works()
+    {
+        $user = $this->users->editor();
+
+        $resp = $this->asAdmin()->delete("settings/users/{$user->id}", ['new_owner_id' => '']);
+        $resp->assertRedirect('/settings/users');
+        $this->assertActivityExists(ActivityType::USER_DELETE);
+        $this->assertSessionHas('success');
+    }
+

     public function test_delete_removes_user_preferences()
     {
         $editor = $this->users->editor();
     public function test_delete_removes_user_preferences()
     {
         $editor = $this->users->editor();