2 files changed, 3 insertions, 5 deletions

diff --git a/framework/Web/UI/TTemplateManager.php b/framework/Web/UI/TTemplateManager.php
index c9a4b9da..81fb7704 100644
--- a/framework/Web/UI/TTemplateManager.php
+++ b/framework/Web/UI/TTemplateManager.php
@@ -32,8 +32,6 @@
  * @package System.Web.UI

  * @since 3.0

  */

-

-

 class TTemplateManager extends TComponent implements IModule

 {

 	/**

diff --git a/framework/Web/UI/TThemeManager.php b/framework/Web/UI/TThemeManager.php
index 178cc91f..47c32a2e 100644
--- a/framework/Web/UI/TThemeManager.php
+++ b/framework/Web/UI/TThemeManager.php
@@ -105,7 +105,7 @@ class TThemeManager extends TComponent implements IModule
 	}

 }

 

-class TTheme extends TTemplate

+class TTheme extends TComponent

 {

 	const THEME_CACHE_PREFIX='prado:theme:';

 	const SKIN_FILE_EXT='.skin';

@@ -171,9 +171,9 @@ class TTheme extends TTemplate
 				}

 			}

 			closedir($dir);

+			if($cache!==null)

+				$cache->set(self::THEME_CACHE_PREFIX.$themePath,array($this->_skins,time()));

 		}

-		if($cache!==null)

-			$cache->set(self::THEME_CACHE_PREFIX.$themePath,array($this->_skins,time()));

 	}

 

 	public function applySkin($control)