Fix scheme being added twice when APP_URL has the scheme (area17#651)

MamlukiSn · May 24, 2020 · 2e5784c · 2e5784c
1 parent 3c2c3a1
commit 2e5784c
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/Http/Controllers/Admin/ModuleController.php b/src/Http/Controllers/Admin/ModuleController.php
@@ -1512,7 +1512,13 @@ protected function getParentModuleForeignKey()
      */
     protected function getPermalinkBaseUrl()
     {
-        return $this->request->getScheme() . '://' . Config::get('app.url') . '/'
+        $appUrl = Config::get('app.url');
+
+        if (blank(parse_url($appUrl)['scheme'] ?? null)) {
+            $appUrl =  $this->request->getScheme() . '://' . $appUrl;
+        }
+
+        return $appUrl . '/'
             . ($this->moduleHas('translations') ? '{language}/' : '')
             . ($this->moduleHas('revisions') ? '{preview}/' : '')
             . ($this->permalinkBase ?? $this->moduleName)