Update SubsiteFluentDirectorInjector.php

innomedia · Dec 9, 2020 · e263906 · e263906
1 parent 66a31a6
commit e263906
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Extensions/SubsiteFluentDirectorInjector.php b/src/Extensions/SubsiteFluentDirectorInjector.php
@@ -17,6 +17,10 @@
 
 class FluentDirectorExtensionInjector extends FluentDirectorExtension
 {
+    public function AdminAddressInSERVER()
+    {
+        return (array_key_exists("REQUEST_URI",$_SERVER) && strpos($_SERVER["REQUEST_URI"],"admin/pages") !== false ) || (array_key_exists("REDIRECT_URL",$_SERVER) && strpos($_SERVER["REDIRECT_URL"],"admin/pages") !== false );
+    }
     public function updateRules(&$rules)
     {
         $originalRules = $rules;
@@ -34,7 +38,7 @@ public function updateRules(&$rules)
         Injector::inst()->create(InitStateMiddleware::class)->process($request, function () {
         });
         $defaultLocale = null;
-        if(class_exists("\SilverStripe\Subsites\Model\SubsiteDomain") && array_key_exists("HTTP_HOST",$_SERVER))
+        if(class_exists("\SilverStripe\Subsites\Model\SubsiteDomain") && array_key_exists("HTTP_HOST",$_SERVER) && !$this->AdminAddressInSERVER())
         {
             try{
                 $host = Convert::raw2sql($_SERVER["HTTP_HOST"]);