Merge pull request #9 from Zheness/patch-1

Update File.php
thecodingmachine · Aug 1, 2018 · 8d86abc · 8d86abc
2 parents 1bcbe0d + ff80451
commit 8d86abc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Mouf/Html/Widgets/JqueryFileUpload/File.php b/src/Mouf/Html/Widgets/JqueryFileUpload/File.php
@@ -84,7 +84,7 @@ public function rename($newFileName, $mode = RenameEnum::MOVE) {
 		if ($mode === RenameEnum::MOVE_AND_RENAME) {
 			$targetFileName = $this->getTargetName($this->directory, $newFileName);
 		} else {
-			$targetFileName = $this->fileName;
+			$targetFileName = $newFileName;
 		}
 
 		$fs->rename($this->directory.'/'.$this->fileName, $this->directory.'/'.$targetFileName, $mode === RenameEnum::MOVE_AND_OVERWRITE);
@@ -109,7 +109,7 @@ public function moveAndRename($targetDir, $newFileName, $mode = RenameEnum::MOVE
 		if ($mode === RenameEnum::MOVE_AND_RENAME) {
 			$targetFileName = $this->getTargetName($targetDir, $newFileName);
 		} else {
-			$targetFileName = $this->fileName;
+			$targetFileName = $newFileName;
 		}
 
 		$fs->rename($this->directory.'/'.$this->fileName, $targetDir.'/'.$targetFileName, $mode === RenameEnum::MOVE_AND_OVERWRITE);