webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-28 17:02:04 +03:00
Code Activity

Merge branch 'v23.02-branch' into development

Browse Source
This commit is contained in:
Dan Brown
2023-04-07 18:12:00 +01:00
parent 95b75c067f 3f3f221e0d
commit 50f3c10f19
6 changed files with 50 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/TagController.php
View File

@ -8,11 +8,9 @@ use Illuminate\Http\Request;
class TagController extends Controller
{
protected TagRepo $tagRepo;
public function __construct(TagRepo $tagRepo)
{
$this->tagRepo = $tagRepo;
public function __construct(
protected TagRepo $tagRepo
) {
}
/**

2
app/Http/Controllers/UserController.php
View File

@ -197,7 +197,7 @@ class UserController extends Controller
$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);