summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorctrlaltca <ctrlaltca@gmail.com>2016-04-06 21:51:11 +0200
committerctrlaltca <ctrlaltca@gmail.com>2016-04-06 21:51:11 +0200
commit6b8e6601752b21a8a96c385a5529bbec7bb2b408 (patch)
treea118ecbcf6e33df8c4b3a0f9bb40a4db2975694f /framework
parent8d257fad74c798aef2d6a6f83551cc4faeb14962 (diff)
parentc3cd65d7be93c4083a45b79ce3092a3c58b8728a (diff)
Merge pull request #584 from pradosoft/fix_581
Fix tracking of localfile path in TActiveFileUpload
Diffstat (limited to 'framework')
-rwxr-xr-xframework/Web/UI/ActiveControls/TActiveFileUpload.php1
-rw-r--r--framework/Web/UI/WebControls/TFileUpload.php2
2 files changed, 2 insertions, 1 deletions
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
*/