diff options
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/I18N/core/data/it_IT.dat | 2 | ||||
| -rw-r--r-- | framework/PradoBase.php | 8 | ||||
| -rw-r--r-- | framework/pradolite.php | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/framework/I18N/core/data/it_IT.dat b/framework/I18N/core/data/it_IT.dat index 738a8455..12448d9c 100644 --- a/framework/I18N/core/data/it_IT.dat +++ b/framework/I18N/core/data/it_IT.dat @@ -1 +1 @@ -a:3:{s:10:"Currencies";a:1:{s:3:"ITL";a:3:{i:0;s:3:"₤";i:1;s:13:"Lira Italiana";i:2;a:3:{i:0;s:18:"¤ #,##0;-¤ #,##0";i:1;s:1:",";i:2;s:1:".";}}}s:7:"Version";a:1:{i:0;s:3:"1.2";}s:8:"calendar";a:1:{s:9:"gregorian";a:1:{s:16:"DateTimePatterns";a:9:{i:0;s:10:"HH:mm:ss z";i:1;s:9:"H:mm:ss z";i:2;s:8:"HH:mm:ss";i:3;s:5:"HH:mm";i:4;s:16:"EEEE d MMMM yyyy";i:5;s:12:"dd MMMM yyyy";i:6;s:9:"dd/MMM/yy";i:7;s:10:"dd/MM/yyyy";i:8;s:7:"{1} {0}";}}}}
\ No newline at end of file +a:3:{s:10:"Currencies";a:1:{s:3:"ITL";a:3:{i:0;s:3:"₤";i:1;s:13:"Lira Italiana";i:2;a:3:{i:0;s:18:"¤ #,##0;-¤ #,##0";i:1;s:1:",";i:2;s:1:".";}}}s:7:"Version";a:1:{i:0;s:3:"1.2";}s:8:"calendar";a:1:{s:9:"gregorian";a:1:{s:16:"DateTimePatterns";a:9:{i:0;s:10:"HH:mm:ss z";i:1;s:9:"H:mm:ss z";i:2;s:8:"HH:mm:ss";i:3;s:5:"HH:mm";i:4;s:16:"EEEE d MMMM yyyy";i:5;s:12:"dd MMMM yyyy";i:6;s:11:"dd/MMM/yyyy";i:7;s:10:"dd/MM/yyyy";i:8;s:7:"{1} {0}";}}}}
\ No newline at end of file diff --git a/framework/PradoBase.php b/framework/PradoBase.php index f75cc680..84826f15 100644 --- a/framework/PradoBase.php +++ b/framework/PradoBase.php @@ -9,7 +9,7 @@ * @link http://www.pradosoft.com/ * @copyright Copyright © 2005-2013 PradoSoft * @license http://www.pradosoft.com/license/ - * @version $Id: PradoBase.php 3293 2013-07-10 21:33:04Z ctrlaltca $ + * @version $Id: PradoBase.php 3325 2013-09-13 08:19:04Z ctrlaltca $ * @package System */ @@ -34,7 +34,7 @@ if(!defined('PRADO_CHMOD')) * rewritten for customization. * * @author Qiang Xue <qiang.xue@gmail.com> - * @version $Id: PradoBase.php 3293 2013-07-10 21:33:04Z ctrlaltca $ + * @version $Id: PradoBase.php 3325 2013-09-13 08:19:04Z ctrlaltca $ * @package System * @since 3.0 */ @@ -169,7 +169,7 @@ class PradoBase */ public static function setApplication($application) { - if(self::$_application!==null) + if(self::$_application!==null && !defined('PRADO_TEST_RUN')) throw new TInvalidOperationException('prado_application_singleton_required'); self::$_application=$application; } @@ -381,7 +381,7 @@ class PradoBase */ public static function setPathOfAlias($alias,$path) { - if(isset(self::$_aliases[$alias])) + if(isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN')) throw new TInvalidOperationException('prado_alias_redefined',$alias); else if(($rp=realpath($path))!==false && is_dir($rp)) { diff --git a/framework/pradolite.php b/framework/pradolite.php index f9ea93d3..af40799f 100644 --- a/framework/pradolite.php +++ b/framework/pradolite.php @@ -1,7 +1,7 @@ <?php /** * File Name: pradolite.php - * Last Update: 2013/09/12 10:36:21 + * Last Update: 2013/09/13 10:37:17 * Generated By: buildscripts/phpbuilder/build.php * * This file is used in lieu of prado.php to boost PRADO application performance. @@ -69,7 +69,7 @@ class PradoBase } public static function setApplication($application) { - if(self::$_application!==null) + if(self::$_application!==null && !defined('PRADO_TEST_RUN')) throw new TInvalidOperationException('prado_application_singleton_required'); self::$_application=$application; } @@ -197,7 +197,7 @@ class PradoBase } public static function setPathOfAlias($alias,$path) { - if(isset(self::$_aliases[$alias])) + if(isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN')) throw new TInvalidOperationException('prado_alias_redefined',$alias); else if(($rp=realpath($path))!==false && is_dir($rp)) { |