]>
BookStack Code Mirror - bookstack/blobdiff - app/Http/Controllers/UserProfileController.php
projects
/
bookstack
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '3027_attachment_vuln'
[bookstack]
/
app
/
Http
/
Controllers
/
UserProfileController.php
diff --git
a/app/Http/Controllers/UserProfileController.php
b/app/Http/Controllers/UserProfileController.php
index 95e68cb07d95e97a583be7a37def344bcadc8819..09ae4c1bd3f6ad265763f39e76cfc3a49aee822c 100644
(file)
--- a/
app/Http/Controllers/UserProfileController.php
+++ b/
app/Http/Controllers/UserProfileController.php
@@
-1,11
+1,13
@@
-<?php namespace BookStack\Http\Controllers;
+<?php
+
+namespace BookStack\Http\Controllers;
use BookStack\Auth\UserRepo;
class UserProfileController extends Controller
{
/**
use BookStack\Auth\UserRepo;
class UserProfileController extends Controller
{
/**
- * Show the user profile page
+ * Show the user profile page
.
*/
public function show(UserRepo $repo, string $slug)
{
*/
public function show(UserRepo $repo, string $slug)
{
@@
-16,10
+18,10
@@
class UserProfileController extends Controller
$assetCounts = $repo->getAssetCounts($user);
return view('users.profile', [
$assetCounts = $repo->getAssetCounts($user);
return view('users.profile', [
- 'user' => $user,
- 'activity' => $userActivity,
+ 'user'
=> $user,
+ 'activity'
=> $userActivity,
'recentlyCreated' => $recentlyCreated,
'recentlyCreated' => $recentlyCreated,
- 'assetCounts'
=> $assetCounts
+ 'assetCounts'
=> $assetCounts,
]);
}
}
]);
}
}