Fix for running in CodeSpaces

chirsz-ever · May 19, 2022 · 5a3773d · 5a3773d
1 parent 25309fd
commit 5a3773d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/libs/Config.php b/libs/Config.php
@@ -222,7 +222,7 @@ public function getBaseUrl()
     public function getBasePage()
     {
         if ($this->isLive()) {
-            $value = '//' . $this->getBaseUrl();
+            $value = $this->getBaseUrl();
             if (!$this['live']['clean_urls']) {
                 $value .= 'index.php/';
             }

diff --git a/libs/Server/Server.php b/libs/Server/Server.php
@@ -27,7 +27,7 @@ public function __construct(Daux $daux)
         $this->daux = $daux;
 
         $this->request = Request::createFromGlobals();
-        $this->base_url = $this->request->getHttpHost() . $this->request->getBaseUrl() . '/';
+        $this->base_url =  str_replace('//', '/', '/' . $this->request->getBaseUrl() . '/');
     }
 
     /**
@@ -125,7 +125,7 @@ public function getConfig()
     {
         $config = $this->daux->getConfig();
 
-        DauxHelper::rebaseConfiguration($config, '//' . $this->base_url);
+        DauxHelper::rebaseConfiguration($config, $this->base_url);
 
         return $config;
     }