diff options
| author | Ciro Mattia Gonano <ciromattia@gmail.com> | 2013-09-13 10:40:10 +0200 |
|---|---|---|
| committer | Ciro Mattia Gonano <ciromattia@gmail.com> | 2013-09-13 10:40:10 +0200 |
| commit | 40b06f3eff0c5fcc52b5473737f31094536e9bca (patch) | |
| tree | abc1fb12ffa03b52790e205d2f837df9806614bd /framework/PradoBase.php | |
| parent | 412a160afd73443c1d06f2828a5f792507fdf63e (diff) | |
Update to r3325
Diffstat (limited to 'framework/PradoBase.php')
| -rw-r--r-- | framework/PradoBase.php | 8 |
1 files changed, 4 insertions, 4 deletions
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)) { |