diff options
| author | xue <> | 2006-08-27 23:26:55 +0000 |
|---|---|---|
| committer | xue <> | 2006-08-27 23:26:55 +0000 |
| commit | c1937cccd0985e86e247287faa9ac60870feecd7 (patch) | |
| tree | 95ec7083c7be815184c74cd8aa27d02a69d2ea77 /framework/Web/UI/TTemplateControl.php | |
| parent | 887da1b3668499821f046665b461aeadb0a9fb2e (diff) | |
Merge from 3.0 branch till 1350.
Diffstat (limited to 'framework/Web/UI/TTemplateControl.php')
| -rw-r--r-- | framework/Web/UI/TTemplateControl.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/framework/Web/UI/TTemplateControl.php b/framework/Web/UI/TTemplateControl.php index 3bbe52c5..7d1f2d7e 100644 --- a/framework/Web/UI/TTemplateControl.php +++ b/framework/Web/UI/TTemplateControl.php @@ -235,6 +235,8 @@ class TTemplateControl extends TCompositeControl foreach($this->_contents as $id=>$content)
$master->injectContent($id,$content);
}
+ else if(!empty($this->_contents))
+ throw new TConfigurationException('templatecontrol_mastercontrol_required',get_class($this));
parent::initRecursive($namingContainer);
}
}
|