diff options
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/PradoBase.php | 2 | ||||
| -rw-r--r-- | framework/Web/UI/TThemeManager.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/framework/PradoBase.php b/framework/PradoBase.php index 7c054bac..30b98f53 100644 --- a/framework/PradoBase.php +++ b/framework/PradoBase.php @@ -68,7 +68,7 @@ class PradoBase */
public static function getVersion()
{
- return '3.0.3';
+ return '3.0.4';
}
/**
diff --git a/framework/Web/UI/TThemeManager.php b/framework/Web/UI/TThemeManager.php index 245f8049..1d80d0c5 100644 --- a/framework/Web/UI/TThemeManager.php +++ b/framework/Web/UI/TThemeManager.php @@ -292,10 +292,10 @@ class TTheme extends TApplicationComponent implements ITheme $template=new TTemplate(file_get_contents($themePath.'/'.$file),$themePath,$themePath.'/'.$file);
foreach($template->getItems() as $skin)
{
- if($skin[0]!==-1)
- throw new TConfigurationException('theme_control_nested',$skin[1],dirname($themePath));
- else if(!isset($skin[2])) // a text string, ignored
+ if(!isset($skin[2])) // a text string, ignored
continue;
+ else if($skin[0]!==-1)
+ throw new TConfigurationException('theme_control_nested',$skin[1],dirname($themePath));
$type=$skin[1];
$id=isset($skin[2]['skinid'])?$skin[2]['skinid']:0;
unset($skin[2]['skinid']);
|