From 8f1fa1c2bb6c2b7cbb493bd2038669b1e1a8ca7d Mon Sep 17 00:00:00 2001 From: xue <> Date: Tue, 5 Sep 2006 11:29:01 +0000 Subject: Fixed #358. --- framework/PradoBase.php | 2 +- framework/Web/UI/WebControls/TFileUpload.php | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'framework') diff --git a/framework/PradoBase.php b/framework/PradoBase.php index cda172a3..108cf1e7 100644 --- a/framework/PradoBase.php +++ b/framework/PradoBase.php @@ -68,7 +68,7 @@ class PradoBase */ public static function getVersion() { - return '3.0.4'; + return '3.0.5'; } /** diff --git a/framework/Web/UI/WebControls/TFileUpload.php b/framework/Web/UI/WebControls/TFileUpload.php index 62c51ccf..17bdcf5b 100644 --- a/framework/Web/UI/WebControls/TFileUpload.php +++ b/framework/Web/UI/WebControls/TFileUpload.php @@ -174,22 +174,21 @@ class TFileUpload extends TWebControl implements IPostBackDataHandler, IValidata * @param string the file name used to save the uploaded file * @param boolean whether to delete the temporary file after saving. * If true, you will not be able to save the uploaded file again. - * @throws TInvalidOperationException file uploading failed or the uploaded - * file cannot be found on the server. + * @return boolean true if the file saving is successful */ public function saveAs($fileName,$deleteTempFile=true) { if($this->_errorCode===UPLOAD_ERR_OK) { if($deleteTempFile) - move_uploaded_file($this->_localName,$fileName); + return move_uploaded_file($this->_localName,$fileName); else if(is_uploaded_file($this->_localName)) - file_put_contents($fileName,file_get_contents($this->_localName)); + return file_put_contents($fileName,file_get_contents($this->_localName))!==false else - throw new TInvalidOperationException('fileupload_saveas_failed'); + return false; } else - throw new TInvalidOperationException('fileupload_saveas_forbidden'); + return false; } /** -- cgit v1.2.3