fix #427

2 files changed, 3 insertions, 1 deletions

diff --git a/HISTORY b/HISTORY
index b86e6ea9..01db8f3d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,7 @@
 Version 3.2.1 to be released
 
 EHN: Issue #260 - TComponent Update: Behaviors, Class Behaviors, fx global events, and dy one to one events (javalizard)
+EHN: Issue #292 - Events should have priorities to allow event handler order to be specified (javalizard)
 BUG: Issue #412 - open_basedir restriction (ctrlaltca)
 BUG: Issue #413 - TActiveDatePicker does not fire TCallbackClientSide's events (ctrlaltca)
 BUG: Issue #414 - ActiveDatagrid's pager does not fire TCallbackClientSide's events (ctrlaltca)
@@ -14,6 +15,7 @@ BUG: Issue #421 - TAutocomplete not rendering an empty suggestion list (Dario Ri
 BUG: Issue #424 - TDefaultButton broken when multiple TDefaultButton are on the same page (ctrlaltca)
 BUG: Issue #425 - Error generating WSDL (cezarpirajant)
 ENH: Issue #426 - Make TDataFieldAccessor capable to access data in nested arrays (ctrlaltca)
+BUG: Issue #427 - Var name mismatch in TActiveFileUpload.php (piotr.knapik)
 
 EHN: Permit to change the default cipher in TSecurityManager::setEncryption(); changed the default cipher from 3DES to AES256 (ctrlaltca)
 EHN: Use php's hash_hmac() when available in TSecurityManager, and permit the use of all algorithms supported by php (ctrlaltca)
diff --git a/framework/Web/UI/ActiveControls/TActiveFileUpload.php b/framework/Web/UI/ActiveControls/TActiveFileUpload.php
index ca924026..6c6d4bd1 100755
--- a/framework/Web/UI/ActiveControls/TActiveFileUpload.php
+++ b/framework/Web/UI/ActiveControls/TActiveFileUpload.php
@@ -276,7 +276,7 @@ EOS;
 			// tricky workaround to intercept "uploaded file too big" error: real uploads happens in onFileUpload instead
 			$this->_errorCode = UPLOAD_ERR_FORM_SIZE;
 			$localName = str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()),''));
-			$filename = addslashes($this->getFileName());
+			$fileName = addslashes($this->getFileName());
 			
 			$params = new TActiveFileUploadCallbackParams;
 			$params->localName = $localName;