Merge branch 'develop'

OFFLINE-GmbH · Sep 3, 2018 · 0c0014f · 0c0014f
2 parents 6739cb2 + d5dec50
commit 0c0014f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/classes/ResponsiveImage.php b/classes/ResponsiveImage.php
@@ -247,16 +247,11 @@ protected function getUnavailableSizes()
      */
     protected function normalizeImagePath($imagePath)
     {
-        // If a relative path gets processed make sure to remove
-        // any subdirectory from the URL.
-        if(substr($imagePath, 0, 4) !== 'http') {
-            $base = $this->getBase();
-            $subdir = trim(str_replace($base, '', env('APP_URL')), '/') . '/';
-            return base_path(str_replace($subdir, '', $imagePath));
-        } else {
-            $imagePath = trim(str_replace(config('app.url'), '', $imagePath), '/');
-            return base_path($imagePath);
-        }
+        $base = $this->getBase();
+
+        $imagePath = trim(str_replace($base, '', $imagePath), '/');
+
+        return base_path($imagePath);
     }
 
     /**
@@ -306,4 +301,4 @@ protected function getPathHash()
     {
         return md5($this->path);
     }
-}
+}
diff --git a/updates/version.yaml b/updates/version.yaml
@@ -12,3 +12,4 @@
 1.1.5: Reverted multi-byte optimization since the change removes the DOCTYPE while parsing the html
 1.1.6: Use correct app url to determine if an image is external or local
 1.1.7: Optimized support for multi-byte character strings (thanks to sergei3456)
+1.1.8: Optimized support for installations that serve multiple domains