diff options
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | framework/Web/UI/TPage.php | 14 |
2 files changed, 9 insertions, 6 deletions
@@ -4,6 +4,7 @@ BUG: Ticket#707 - TPropertyAccess sets property twice on object when using sette BUG: Ticket#719 - TAutoCompleter should not trigger Validation if CausesValidation=False (Christophe) BUG: Ticket#744 - Callback error handling is improved (Qiang) BUG: Ticket#750 - The "expire" parameter is used inconsistently in cache modules (Qiang) +BUG: Ticket#753 - Themes not allways being set (Qiang) BUG: Fixed a bug in TPropertyValue::ensureArray() (Qiang) CHG: Changed TConditional so that the controls in its template behave like they are in its parent (Qiang) CHG: Active Record many-to-many relationship change from self::HAS_MANY to self::MANY_TO_MANY (Wei) diff --git a/framework/Web/UI/TPage.php b/framework/Web/UI/TPage.php index dba0b5b5..13c9eef3 100644 --- a/framework/Web/UI/TPage.php +++ b/framework/Web/UI/TPage.php @@ -645,18 +645,20 @@ class TPage extends TTemplateControl {
$this->raiseEvent('OnPreRenderComplete',$this,$param);
$cs=$this->getClientScript();
- if($this->_theme instanceof ITheme)
+ $theme=$this->getTheme();
+ if($theme instanceof ITheme)
{
- foreach($this->_theme->getStyleSheetFiles() as $url)
+ foreach($theme->getStyleSheetFiles() as $url)
$cs->registerStyleSheetFile($url,$url,$this->getCssMediaType($url));
- foreach($this->_theme->getJavaScriptFiles() as $url)
+ foreach($theme->getJavaScriptFiles() as $url)
$cs->registerHeadScriptFile($url,$url);
}
- if($this->_styleSheet instanceof ITheme)
+ $styleSheet=$this->getStyleSheetTheme();
+ if($styleSheet instanceof ITheme)
{
- foreach($this->_styleSheet->getStyleSheetFiles() as $url)
+ foreach($stylesheet->getStyleSheetFiles() as $url)
$cs->registerStyleSheetFile($url,$url,$this->getCssMediaType($url));
- foreach($this->_styleSheet->getJavaScriptFiles() as $url)
+ foreach($styleSheet->getJavaScriptFiles() as $url)
$cs->registerHeadScriptFile($url,$url);
}
|