fixed incorrect use of 'filename'

WanWizard · WanWizard · commit fdba921e861a · 2013-03-06T21:48:23.000+01:00
diff --git a/src/FuelPHP/Upload/File.php b/src/FuelPHP/Upload/File.php
@@ -204,11 +204,11 @@ public function validate()
 			$this->container['extension'] = ltrim(strrchr(ltrim($this->container['name'], '.'), '.'),'.');
 			if (empty($this->container['extension']))
 			{
-				$this->container['filename'] = $this->container['name'];
+				$this->container['basename'] = $this->container['name'];
 			}
 			else
 			{
-				$this->container['filename'] = substr($this->container['name'], 0, strlen($this->container['name'])-(strlen($this->container['extension'])+1));
+				$this->container['basename'] = substr($this->container['name'], 0, strlen($this->container['name'])-(strlen($this->container['extension'])+1));
 			}
 
 			// does this upload exceed the maximum size?
@@ -336,7 +336,7 @@ public function save()
 				// do we need to normalize the filename?
 				else
 				{
-					$this->container['filename']  = $this->container['name'];
+					$this->container['filename']  = $this->container['basename'];
 					(bool) $this->config['normalize'] and $this->normalize();
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -204,11 +204,11 @@ public function validate()`
`204`	`204`	`$this->container['extension'] = ltrim(strrchr(ltrim($this->container['name'], '.'), '.'),'.');`
`205`	`205`	`if (empty($this->container['extension']))`
`206`	`206`	`{`
`207`		`- $this->container['filename'] = $this->container['name'];`
	`207`	`+ $this->container['basename'] = $this->container['name'];`
`208`	`208`	`}`
`209`	`209`	`else`
`210`	`210`	`{`
`211`		`- $this->container['filename'] = substr($this->container['name'], 0, strlen($this->container['name'])-(strlen($this->container['extension'])+1));`
	`211`	`+ $this->container['basename'] = substr($this->container['name'], 0, strlen($this->container['name'])-(strlen($this->container['extension'])+1));`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`// does this upload exceed the maximum size?`
`@@ -336,7 +336,7 @@ public function save()`
`336`	`336`	`// do we need to normalize the filename?`
`337`	`337`	`else`
`338`	`338`	`{`
`339`		`- $this->container['filename'] = $this->container['name'];`
	`339`	`+ $this->container['filename'] = $this->container['basename'];`
`340`	`340`	`(bool) $this->config['normalize'] and $this->normalize();`
`341`	`341`	`}`
`342`	`342`	`}`