From d42b25cbf6d3f1e51cb2a3149f1ff54cc5474bc9 Mon Sep 17 00:00:00 2001 From: emkael Date: Thu, 7 Apr 2016 16:09:16 +0200 Subject: * Prado upgrade (to 3.3.r6b8e6601752b21a8a96c385a5529bbec7bb2b408) --- lib/prado/framework/I18N/TChoiceFormat.php | 2 +- lib/prado/framework/I18N/TDateFormat.php | 2 +- lib/prado/framework/I18N/TGlobalization.php | 2 +- lib/prado/framework/I18N/TGlobalizationAutoDetect.php | 2 +- lib/prado/framework/I18N/TI18NControl.php | 2 +- lib/prado/framework/I18N/TNumberFormat.php | 2 +- lib/prado/framework/I18N/TTranslate.php | 2 +- lib/prado/framework/I18N/TTranslateParameter.php | 2 +- lib/prado/framework/I18N/Translation.php | 2 +- lib/prado/framework/I18N/core/TCache_Lite.php | 9 +-------- 10 files changed, 10 insertions(+), 17 deletions(-) (limited to 'lib/prado/framework/I18N') diff --git a/lib/prado/framework/I18N/TChoiceFormat.php b/lib/prado/framework/I18N/TChoiceFormat.php index 28f0487..81900c3 100644 --- a/lib/prado/framework/I18N/TChoiceFormat.php +++ b/lib/prado/framework/I18N/TChoiceFormat.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo * @link https://github.com/pradosoft/prado - * @copyright Copyright © 2005-2015 The PRADO Group + * @copyright Copyright © 2005-2016 The PRADO Group * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT * @package System.I18N */ diff --git a/lib/prado/framework/I18N/TDateFormat.php b/lib/prado/framework/I18N/TDateFormat.php index 5cb2ee8..3108508 100644 --- a/lib/prado/framework/I18N/TDateFormat.php +++ b/lib/prado/framework/I18N/TDateFormat.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo * @link https://github.com/pradosoft/prado - * @copyright Copyright © 2005-2015 The PRADO Group + * @copyright Copyright © 2005-2016 The PRADO Group * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT * @package System.I18N */ diff --git a/lib/prado/framework/I18N/TGlobalization.php b/lib/prado/framework/I18N/TGlobalization.php index 7976277..41c89c1 100644 --- a/lib/prado/framework/I18N/TGlobalization.php +++ b/lib/prado/framework/I18N/TGlobalization.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo * @link https://github.com/pradosoft/prado - * @copyright Copyright © 2005-2015 The PRADO Group + * @copyright Copyright © 2005-2016 The PRADO Group * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT * @package System.I18N */ diff --git a/lib/prado/framework/I18N/TGlobalizationAutoDetect.php b/lib/prado/framework/I18N/TGlobalizationAutoDetect.php index 2412712..707424d 100644 --- a/lib/prado/framework/I18N/TGlobalizationAutoDetect.php +++ b/lib/prado/framework/I18N/TGlobalizationAutoDetect.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo * @link https://github.com/pradosoft/prado - * @copyright Copyright © 2005-2015 The PRADO Group + * @copyright Copyright © 2005-2016 The PRADO Group * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT * @version $Revision: 1.66 $ $Date: ${DATE} ${TIME} $ * @package System.I18N diff --git a/lib/prado/framework/I18N/TI18NControl.php b/lib/prado/framework/I18N/TI18NControl.php index d784dfc..b89440d 100644 --- a/lib/prado/framework/I18N/TI18NControl.php +++ b/lib/prado/framework/I18N/TI18NControl.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo * @link https://github.com/pradosoft/prado - * @copyright Copyright © 2005-2015 The PRADO Group + * @copyright Copyright © 2005-2016 The PRADO Group * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT * @package System.I18N */ diff --git a/lib/prado/framework/I18N/TNumberFormat.php b/lib/prado/framework/I18N/TNumberFormat.php index ac7a736..4e8a022 100644 --- a/lib/prado/framework/I18N/TNumberFormat.php +++ b/lib/prado/framework/I18N/TNumberFormat.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo * @link https://github.com/pradosoft/prado - * @copyright Copyright © 2005-2015 The PRADO Group + * @copyright Copyright © 2005-2016 The PRADO Group * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT * @package System.I18N */ diff --git a/lib/prado/framework/I18N/TTranslate.php b/lib/prado/framework/I18N/TTranslate.php index 1289a70..9f70a50 100644 --- a/lib/prado/framework/I18N/TTranslate.php +++ b/lib/prado/framework/I18N/TTranslate.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo * @link https://github.com/pradosoft/prado - * @copyright Copyright © 2005-2015 The PRADO Group + * @copyright Copyright © 2005-2016 The PRADO Group * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT * @package System.I18N */ diff --git a/lib/prado/framework/I18N/TTranslateParameter.php b/lib/prado/framework/I18N/TTranslateParameter.php index a12546e..230c0a9 100644 --- a/lib/prado/framework/I18N/TTranslateParameter.php +++ b/lib/prado/framework/I18N/TTranslateParameter.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo * @link https://github.com/pradosoft/prado - * @copyright Copyright © 2005-2015 The PRADO Group + * @copyright Copyright © 2005-2016 The PRADO Group * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT * @package System.I18N */ diff --git a/lib/prado/framework/I18N/Translation.php b/lib/prado/framework/I18N/Translation.php index 69b3eb4..4e244a4 100644 --- a/lib/prado/framework/I18N/Translation.php +++ b/lib/prado/framework/I18N/Translation.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo * @link https://github.com/pradosoft/prado - * @copyright Copyright © 2005-2015 The PRADO Group + * @copyright Copyright © 2005-2016 The PRADO Group * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT * @package System.I18N */ diff --git a/lib/prado/framework/I18N/core/TCache_Lite.php b/lib/prado/framework/I18N/core/TCache_Lite.php index 69e1c30..b42bf1f 100644 --- a/lib/prado/framework/I18N/core/TCache_Lite.php +++ b/lib/prado/framework/I18N/core/TCache_Lite.php @@ -228,7 +228,7 @@ class TCache_Lite * @param array $options options * @access public */ - function TCache_Lite($options = array(null)) + function __construct($options = array(null)) { $availableOptions = array( 'automaticSerialization', 'fileNameProtection', @@ -533,18 +533,11 @@ class TCache_Lite // because the filesize can be cached by PHP itself... clearstatcache(); $length = @filesize($this->_file); - if(version_compare(PHP_VERSION, '5.3.0', 'lt')) - { - $mqr = get_magic_quotes_runtime(); - set_magic_quotes_runtime(0); - } if ($this->_readControl) { $hashControl = @fread($fp, 32); $length = $length - 32; } $data = @fread($fp, $length); - if(isset($mqr)) - set_magic_quotes_runtime($mqr); if ($this->_fileLocking) @flock($fp, LOCK_UN); @fclose($fp); if ($this->_readControl) { -- cgit v1.2.3