From c1937cccd0985e86e247287faa9ac60870feecd7 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sun, 27 Aug 2006 23:26:55 +0000
Subject: Merge from 3.0 branch till 1350.

---
 framework/Web/UI/TTemplateControl.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'framework/Web/UI/TTemplateControl.php')

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);
 	}
 }
-- 
cgit v1.2.3