Merge pull request #2123 from lucifergit/patch-2

lonnieezell · web-flow · commit baaefe7e3b43 · 2019-10-17T10:45:06.000-05:00
WIP fix store() default value bug
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;
 	}
 
 	//--------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -400,12 +400,12 @@ public function isValid(): bool`
`400`	`400`	`*/`
`401`	`401`	`public function store(string $folderName = null, string $fileName = null): string`
`402`	`402`	`{`
`403`		`- $folderName = $folderName ?? date('Ymd');`
	`403`	`+ $folderName = rtrim($folderName ?? date('Ymd'), '/') . '/' ;`
`404`	`404`	`$fileName = $fileName ?? $this->getRandomName();`
`405`	`405`
`406`	`406`	`// Move the uploaded file to a new location.`
`407`	`407`	`return ($this->move(WRITEPATH . 'uploads/' . $folderName, $fileName)) ?`
`408`		`- $folderName . DIRECTORY_SEPARATOR . $this->name : null;`
	`408`	`+ $folderName . $this->name : null;`
`409`	`409`	`}`
`410`	`410`
`411`	`411`	`//--------------------------------------------------------------------`