Merge branch 'develop'

ShopBundle/Twig/FrontendTwigExtension.php

@@ -70,17 +70,19 @@ class FrontendTwigExtension extends AbstractExtension
                 if (substr($path, 0, 1) === '/') $path = substr($path, 1);
 
                 if ($path) {
-                        $fileManagerFolder = substr($this->getFileManagerFolder(), 1)  ;
+                        $fileManagerFolder = substr($this->getFileManagerFolder(), 1);
 
                         if (strpos($path, $fileManagerFolder) === false) {
                                 $path = $fileManagerFolder . '/' . $path;
                         }
+                        if (file_exists($path)) {
+                                return $this->liipCacheHelper->getBrowserPath($path, $thumb);
+                        }
 
-                        return $this->liipCacheHelper->getBrowserPath($path, $thumb);
-                } else {
-
-                        return $this->liipCacheHelper->getBrowserPath($this->getFileManagerFolder() . '/' . $default, $thumb);
                 }
+
+                return $this->liipCacheHelper->getBrowserPath($this->getFileManagerFolder() . '/' . $default, $thumb);
+
         }
 
         /**