Merge branch 'master' into fix_svg_thumbnails

* master: use original filename when no name is provided when uploading a file
Kunstmaan · Aug 20, 2014 · ef96f4e · ef96f4e
2 parents f09ffc5 + 63af445
commit ef96f4e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Helper/File/FileHandler.php b/Helper/File/FileHandler.php
@@ -133,6 +133,10 @@ public function prepareMedia(Media $media)
         }
         if ($content instanceof UploadedFile) {
             $media->setOriginalFilename($content->getClientOriginalName());
+            $name = $media->getName();
+            if (empty($name)) {
+                $media->setName($media->getOriginalFilename());
+            }
         }
 
         $media->setFileSize(filesize($media->getContent()));