Minor tweaks

GrupaZero · Dec 26, 2016 · 25c1d4d · 25c1d4d
1 parent 7487d54
commit 25c1d4d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
@@ -27,12 +27,12 @@ public function __construct(Register $userMenu)
     public function account()
     {
         /**@TODO we need proper user menu method */
-        return view('account.index', ['menu' => $this->userMenu->getMenu(), 'user' => auth()->user()]);
+        return view('account.index', ['menu' => $this->userMenu->getMenu()]);
     }
 
     public function edit()
     {
-        return view('account.edit', ['menu' => $this->userMenu->getMenu(), 'user' => auth()->user()]);
+        return view('account.edit', ['menu' => $this->userMenu->getMenu()]);
     }
 
     public function welcome(Request $request)
@@ -48,6 +48,6 @@ public function welcome(Request $request)
 
     public function oauth()
     {
-        return view('account.oauth', ['menu' => $this->userMenu->getMenu(), 'user' => auth()->user()]);
+        return view('account.oauth', ['menu' => $this->userMenu->getMenu()]);
     }
 }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -20,7 +20,7 @@ public function boot()
             function ($view) {
                 $data = [];
                 $user = auth()->user();
-                if ($user) {
+                if (!$user->isGuest()) {
                     $data = [
                         "id"       => $user["id"],
                         "username" => $user->getPresenter()->displayName(),