Merge pull request #2123 from lucifergit/patch-2

WIP fix store() default value bug
codeigniter4 · Oct 17, 2019 · baaefe7 · baaefe7
2 parents 345caa3 + 5be9a5c
commit baaefe7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php
@@ -400,12 +400,12 @@ public function isValid(): bool
 	 */
 	public function store(string $folderName = null, string $fileName = null): string
 	{
-		$folderName = $folderName ?? date('Ymd');
+		$folderName = rtrim($folderName ?? date('Ymd'), '/') . '/' ;
 		$fileName   = $fileName ?? $this->getRandomName();
 
 		// Move the uploaded file to a new location.
 		return ($this->move(WRITEPATH . 'uploads/' . $folderName, $fileName)) ?
-				$folderName . DIRECTORY_SEPARATOR . $this->name : null;
+				$folderName . $this->name : null;
 	}
 
 	//--------------------------------------------------------------------