From bd06797c242aaafdeb5d77e929102e325cabf058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Mon, 15 Aug 2016 20:48:17 +0200
Subject: [PATCH] FEATURE: do not use Module::enabled() in registering admin
 menu

---
 app/Http/Middleware/AdminMenuRegistrator.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Http/Middleware/AdminMenuRegistrator.php b/app/Http/Middleware/AdminMenuRegistrator.php
index d61159f1..6c35d6f6 100644
--- a/app/Http/Middleware/AdminMenuRegistrator.php
+++ b/app/Http/Middleware/AdminMenuRegistrator.php
@@ -3,6 +3,7 @@
 namespace App\Http\Middleware;
 
 use App\Handlers\Handler;
+use App\Models\Module;
 use Closure;
 use Illuminate\Support\Facades\Log;
 
@@ -27,16 +28,16 @@ class AdminMenuRegistrator
         $user = \Auth::user();
         Handler::registerAdminMenu($user);
 
-        $modules = \Module::enabled();
+        $modules = Module::where('enabled', true)
+                         ->get();
 
         // iterate over all enabled modules
         foreach ($modules as $key => $module) {
-            $handler = config($module->getName() . '.handler');
             // try to register menus
             try {
-                call_user_func([$handler, 'registerAdminMenu'], $user);
+                call_user_func([$module->handler, 'registerAdminMenu'], $user);
             } catch (\Exception $e) {
-                Log::debug('Error in '.$handler.'::registerAdminMenu: '.$e->getMessage());
+                Log::debug('Error in ' . $module->handler . '::registerAdminMenu: ' . $e->getMessage());
             }
         }