From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 25 Oct 2019 14:10:18 +0000 (+0200)
Subject: done #3161
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=0c7f9a0f676328c2f363de022696f9cf7b167d13;p=cubist_cms-back.git

done #3161
---

diff --git a/src/app/Middleware/LocaleSelector.php b/src/app/Middleware/LocaleSelector.php
index 6071a2b..e3c29f2 100644
--- a/src/app/Middleware/LocaleSelector.php
+++ b/src/app/Middleware/LocaleSelector.php
@@ -13,9 +13,6 @@ class LocaleSelector extends CubistMiddleware
     public function handle(Request $request, Closure $next)
     {
         parent::handle($request, $next);
-        if ($this->onAdmin()) {
-            return $this->getResponse();
-        }
 
         $class = Locale::getLocaleClass();
 
@@ -36,6 +33,7 @@ class LocaleSelector extends CubistMiddleware
         if (
             null === $selectedLocale ||
             !(
+                $this->onAdmin() ||
                 $locales[$selectedLocale]->enabled ||
                 $this->can('backpack_translation')
             )