Merge from 3.0 branch till 1073.

1 files changed, 9 insertions, 0 deletions

diff --git a/framework/Web/UI/TThemeManager.php b/framework/Web/UI/TThemeManager.php
index c351bcdb..6a908759 100644
--- a/framework/Web/UI/TThemeManager.php
+++ b/framework/Web/UI/TThemeManager.php
@@ -207,6 +207,7 @@ class TTheme extends TApplicationComponent implements ITheme
 	public function __construct($themePath,$themeUrl)

 	{

 		$this->_themeUrl=$themeUrl;

+		$this->_themePath=realpath($themePath);

 		$this->_name=basename($themePath);

 		$cacheValid=false;

 		// TODO: the following needs to be cleaned up (Qiang)

@@ -309,6 +310,14 @@ class TTheme extends TApplicationComponent implements ITheme
 	}

 

 	/**

+	 * @return string the file path to the theme folder

+	 */

+	public function getBasePath()

+	{

+		return $this->_themePath;

+	}

+

+	/**

 	 * Applies the theme to a particular control.

 	 * The control's class name and SkinID value will be used to

 	 * identify which skin to be applied. If the control's SkinID is empty,