Fix for #3

andrewelkins · Mar 7, 2014 · 831b936 · 831b936
1 parent 7651e75
commit 831b936
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Andrew13/Cabinet/CabinetUpload.php b/src/Andrew13/Cabinet/CabinetUpload.php
@@ -180,11 +180,13 @@ public function resolveFileName($folder, UploadedFile $file, $enableObfuscation=
         }
 
         if(static::$app['config']->get('cabinet::obfuscate_filenames') && $enableObfuscation) {
-            $file = basename($file->fileSystemName, $file->getClientOriginalExtension()) . '_' . md5( uniqid(mt_rand(), true) ) . '.' . $file->getClientOriginalExtension();
-        }
+            $fileName = basename($file->fileSystemName, $file->getClientOriginalExtension()) . '_' . md5( uniqid(mt_rand(), true) ) . '.' . $file->getClientOriginalExtension();
+        } else {
+	    $fileName = $file->fileSystemName;
+	}
 
         // If file exists append string and try again.
-        if (File::isFile($folder.$file->fileSystemName)) {
+        if (File::isFile($folder.$fileName)) {
             // Default file postfix
             $i = '0000';
 
@@ -328,4 +330,4 @@ public function cleanPath($path)
 
         return $path;
     }
-}
+}