Merge pull request #81 from jdecool/feature/twig-extension-path

Ensure clean path in Twig extension
novaway · Jul 4, 2016 · 949ac20 · 949ac20
2 parents d27e6c3 + 3c03128
commit 949ac20
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/Twig/Extension/FileManagementExtension.php b/Twig/Extension/FileManagementExtension.php
@@ -36,7 +36,10 @@ public function filepath($entity, $propertyName)
             return null;
         }
 
-        return $this->webDirectory.$filePath;
+        return sprintf('%s/%s',
+            rtrim($this->webDirectory, '/'),
+            ltrim($filePath, '/')
+        );
     }
 
     public function imagepath($entity, $propertyName, $format, $updateCache = true)
@@ -82,10 +85,10 @@ private function getUrl($path)
             return null;
         }
 
-        return sprintf('%s://%s%s',
+        return sprintf('%s://%s/%s',
             $this->generator->getContext()->getScheme(),
-            $this->generator->getContext()->getHost(),
-            $path
+            rtrim($this->generator->getContext()->getHost(), '/'),
+            ltrim($path, '/')
         );
     }
 }