Merge from 3.0 branch till 924

1 files changed, 4 insertions, 1 deletions

diff --git a/framework/TApplication.php b/framework/TApplication.php
index 893856de..ef2fd1a1 100644
--- a/framework/TApplication.php
+++ b/framework/TApplication.php
@@ -755,10 +755,13 @@ class TApplication extends TComponent
 	}
 
 	/**
+	 * @param boolean whether to create globalization if it does not exist
 	 * @return TGlobalization globalization module
 	 */
-	public function getGlobalization()
+	public function getGlobalization($createIfNotExists=true)
 	{
+		if($this->_globalization===null && $createIfNotExists)
+			$this->_globalization=new TGlobalization;
 		return $this->_globalization;
 	}