From 04d0e795553a36bc0b1ae66c371e83a995fd0504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Wed, 30 Oct 2019 13:58:32 +0100 Subject: [PATCH] Fix bugs --- src/Middleware/PreventAccessFromTenantDomains.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Middleware/PreventAccessFromTenantDomains.php b/src/Middleware/PreventAccessFromTenantDomains.php index 4216ff44..92fda549 100644 --- a/src/Middleware/PreventAccessFromTenantDomains.php +++ b/src/Middleware/PreventAccessFromTenantDomains.php @@ -23,7 +23,7 @@ class PreventAccessFromTenantDomains public function handle($request, Closure $next) { // If the route is universal, always let the request pass. - if ($this->routeHasMiddleware($request()->route(), 'universal')) { + if ($this->routeHasMiddleware($request->route(), 'universal')) { return $next($request); } @@ -54,8 +54,8 @@ class PreventAccessFromTenantDomains // Loop one level deep and check if the route's middleware // groups have a `tenancy` middleware group inside them $middlewareGroups = Router::getMiddlewareGroups(); - foreach ($route->gatherMiddleware() as $middleware) { - if (isset($middlewareGroups[$middleware]) && in_array($middleware, $middlewareGroups[$middleware], true)) { + foreach ($route->gatherMiddleware() as $inner) { + if (isset($middlewareGroups[$inner]) && in_array($middleware, $middlewareGroups[$inner], true)) { return true; } }