Update StaticpagesController.php

wedevelopnl · May 2, 2018 · 5675f11 · 5675f11
1 parent 1bf9ed2
commit 5675f11
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/Controllers/StaticpagesController.php b/src/Controllers/StaticpagesController.php
@@ -62,8 +62,10 @@ public function transformURL($url)
         //Fix url for subsites
         $httpHost = $_SERVER['HTTP_HOST'];
         if(class_exists('SilverStripe\Subsites\Model\Subsite')){
-
-            $httpHost = \SilverStripe\Subsites\Model\Subsite::currentSubsite()->domain();
+            $currentSubsite = \SilverStripe\Subsites\Model\Subsite::currentSubsite();
+            if($currentSubsite){
+                $httpHost = $currentSubsite->domain();
+            }
         }
         $newURL = str_replace($parts['host'], $httpHost, $url);
 
@@ -258,8 +260,10 @@ public function removeAll($currentSubsiteOnly = false)
         $subDir = '';
         if($currentSubsiteOnly){
             if(class_exists('SilverStripe\Subsites\Model\Subsite')){
-                $httpHost = \SilverStripe\Subsites\Model\Subsite::currentSubsite()->domain();
-                $subDir = '/' . $httpHost;
+                $currentSubsite = \SilverStripe\Subsites\Model\Subsite::currentSubsite();
+                if($currentSubsite){
+                    $subDir = '/' . $currentSubsite->domain();
+                }
             }
         }
         $staticpath = Director::baseFolder() . '/' . $this->_cachepath . $subDir;