From cc3370c4b197f6548f16c326ac417ba2b2c93aec Mon Sep 17 00:00:00 2001
From: Andy Heathershaw <andy@andysh.uk>
Date: Wed, 11 Jul 2018 08:00:40 +0100
Subject: [PATCH] #62: Don't clobber the $albums variables in the navbar, so it
 now shows all albums not just the single page you're currently viewing

---
 app/Http/Middleware/GlobalConfiguration.php           | 2 +-
 resources/views/themes/base/partials/navbar.blade.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Middleware/GlobalConfiguration.php b/app/Http/Middleware/GlobalConfiguration.php
index 5c509d3..49e8709 100644
--- a/app/Http/Middleware/GlobalConfiguration.php
+++ b/app/Http/Middleware/GlobalConfiguration.php
@@ -63,7 +63,7 @@ class GlobalConfiguration
     private function addAlbumsToView()
     {
         $albums = DbHelper::getAlbumsForCurrentUser_NonPaged()->get();
-        View::share('albums', $albums);
+        View::share('g_albums', $albums);
 
         $albumsToUpload = DbHelper::getAlbumsForCurrentUser_NonPaged('upload-photos')->get();
         View::share('g_albums_upload', $albumsToUpload);
diff --git a/resources/views/themes/base/partials/navbar.blade.php b/resources/views/themes/base/partials/navbar.blade.php
index 0a8b6ac..b302050 100644
--- a/resources/views/themes/base/partials/navbar.blade.php
+++ b/resources/views/themes/base/partials/navbar.blade.php
@@ -20,7 +20,7 @@
                         <i class="fa fa-book"></i> @lang('navigation.navbar.albums')
                     </a>
                     <div class="dropdown-menu">
-                        @foreach ($albums as $album)
+                        @foreach ($g_albums as $album)
                             <a class="dropdown-item" href="{{ $album->url() }}">{{ $album->name }}</a>
                         @endforeach
                     </div>