summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY1
-rwxr-xr-xframework/Web/UI/ActiveControls/TActiveFileUpload.php1
-rw-r--r--framework/Web/UI/WebControls/TFileUpload.php2
3 files changed, 3 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index af5358f1..ea1c8892 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2,6 +2,7 @@ Version 3.3.1 XXX XX, 2016
BUG: Issue #540 - Fix TActiveFileUpload on IE11 (ctrlaltca)
BUG: Issue #574 - Fix TActiveCustomValidator validation after error (ctrlaltca)
+BUG: Issue #581 - TActiveFileUpload loses track of LocalName for a moment (emkael)
BUG: Issue #582 - Prado autoloader breaks class_exists conditionals (ctrlaltca)
BUG: TJuiAutoComplete: fix parsing of suggestions (ctrlaltca)
BUG: Fix callback for controls with PostState=false (ctrlaltca)
diff --git a/framework/Web/UI/ActiveControls/TActiveFileUpload.php b/framework/Web/UI/ActiveControls/TActiveFileUpload.php
index 7f11115a..04350411 100755
--- a/framework/Web/UI/ActiveControls/TActiveFileUpload.php
+++ b/framework/Web/UI/ActiveControls/TActiveFileUpload.php
@@ -101,6 +101,7 @@ class TActiveFileUpload extends TFileUpload implements IActiveControl, ICallback
// save the file so that it will persist past the end of this return.
$localName = str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()),''));
parent::saveAs($localName);
+ $this->_localName = $localName;
$params = new TActiveFileUploadCallbackParams;
$params->localName = $localName;
diff --git a/framework/Web/UI/WebControls/TFileUpload.php b/framework/Web/UI/WebControls/TFileUpload.php
index 142543c7..60f46701 100644
--- a/framework/Web/UI/WebControls/TFileUpload.php
+++ b/framework/Web/UI/WebControls/TFileUpload.php
@@ -47,7 +47,7 @@ class TFileUpload extends TWebControl implements IPostBackDataHandler, IValidata
/**
* @var string the name of the temporary file storing the uploaded file
*/
- private $_localName='';
+ protected $_localName='';
/**
* @var string the uploaded file mime type
*/