Support glide urls with URL params

ryanmitchell · Oct 23, 2024 · ad5fa11 · ad5fa11
1 parent cce7045
commit ad5fa11
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/Imaging/GlideManager.php b/src/Imaging/GlideManager.php
@@ -167,6 +167,7 @@ private function getCachePathCallable()
         $hashCallable = $this->getHashCallable();
 
         return function ($path, $params) use ($hashCallable) {
+            $path = Str::before($path, '?');
             $sourcePath = $this->getSourcePath($path);
 
             if ($this->sourcePathPrefix) {

diff --git a/src/Imaging/ImageGenerator.php b/src/Imaging/ImageGenerator.php
@@ -118,13 +118,14 @@ private function doGenerateByUrl($url, array $params)
         $this->skip_validation = true;
         $this->setParams($params);
 
+        $qs = Str::after($url, '?');
         $parsed = $this->parseUrl($url);
 
         $this->server->setSource($this->guzzleSourceFilesystem($parsed['base']));
         $this->server->setSourcePathPrefix('/');
         $this->server->setCachePathPrefix('http');
 
-        return $this->generate($parsed['path']);
+        return $this->generate($parsed['path'].($qs ? '?'.$qs : ''));
     }
 
     /**