diff options
| author | Ciro Mattia Gonano <ciromattia@gmail.com> | 2013-09-11 15:56:48 +0200 |
|---|---|---|
| committer | Ciro Mattia Gonano <ciromattia@gmail.com> | 2013-09-11 15:57:07 +0200 |
| commit | 3069eaf35e833ffe4a1c1c7829dd7e168ae27420 (patch) | |
| tree | d0c2e4d934cc34ba7d4232f759923b5a257dcb21 /framework/TApplication.php | |
| parent | b833247ce597ec26159b46c8dfbea7f1e265950b (diff) | |
Merge up to r3319
Diffstat (limited to 'framework/TApplication.php')
| -rw-r--r-- | framework/TApplication.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/framework/TApplication.php b/framework/TApplication.php index a4a4b423..1bbbbdb6 100644 --- a/framework/TApplication.php +++ b/framework/TApplication.php @@ -6,7 +6,7 @@ * @link http://www.pradosoft.com/ * @copyright Copyright © 2005-2013 PradoSoft * @license http://www.pradosoft.com/license/ - * @version $Id: TApplication.php 3272 2013-02-13 21:43:28Z ctrlaltca $ + * @version $Id: TApplication.php 3317 2013-09-03 10:19:09Z ctrlaltca $ * @package System */ @@ -105,7 +105,7 @@ Prado::using('System.I18N.TGlobalization'); * </code> * * @author Qiang Xue <qiang.xue@gmail.com> - * @version $Id: TApplication.php 3272 2013-02-13 21:43:28Z ctrlaltca $ + * @version $Id: TApplication.php 3317 2013-09-03 10:19:09Z ctrlaltca $ * @package System * @since 3.0 */ @@ -972,7 +972,8 @@ class TApplication extends TComponent $module->setSubProperty($name,$value); } $this->setModule($id,$module); - unset($this->_lazyModules[$id]); + // keep the key to avoid reuse of the old module id + $this->_lazyModules[$id]=null; return array($module,$configElement); } @@ -1279,7 +1280,7 @@ class TApplication extends TComponent * - Normal: the application is running in normal production mode. * - Performance: the application is running in performance mode. * @author Qiang Xue <qiang.xue@gmail.com> - * @version $Id: TApplication.php 3272 2013-02-13 21:43:28Z ctrlaltca $ + * @version $Id: TApplication.php 3317 2013-09-03 10:19:09Z ctrlaltca $ * @package System * @since 3.0.4 */ @@ -1299,7 +1300,7 @@ class TApplicationMode extends TEnumerable * * @author Qiang Xue <qiang.xue@gmail.com> * @author Carl G. Mathisen <carlgmathisen@gmail.com> - * @version $Id: TApplication.php 3272 2013-02-13 21:43:28Z ctrlaltca $ + * @version $Id: TApplication.php 3317 2013-09-03 10:19:09Z ctrlaltca $ * @package System * @since 3.0 */ @@ -1808,7 +1809,7 @@ class TApplicationConfiguration extends TComponent * Cache will be exploited if it is enabled. * * @author Qiang Xue <qiang.xue@gmail.com> - * @version $Id: TApplication.php 3272 2013-02-13 21:43:28Z ctrlaltca $ + * @version $Id: TApplication.php 3317 2013-09-03 10:19:09Z ctrlaltca $ * @package System * @since 3.0 */ |