Correctly create the template object in BaseTemplate::insert() (see #…

…7366)
contao · Oct 21, 2014 · da65d49 · da65d49
1 parent c35d1e4
commit da65d49
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/system/docs/CHANGELOG.md b/system/docs/CHANGELOG.md
@@ -4,6 +4,9 @@ Contao Open Source CMS changelog
 Version 3.3.6 (2014-XX-XX)
 --------------------------
 
+### Fixed
+Correctly create a template object in `BaseTemplate::insert()` (see #7366).
+
 ### Updated
 Updated TinyMCE to version 4.1.6 and added the "lists" plugin (see #7349).
 

diff --git a/system/modules/core/library/Contao/BaseTemplate.php b/system/modules/core/library/Contao/BaseTemplate.php
@@ -263,7 +263,18 @@ public function endblock()
 	 */
 	public function insert($name, array $data=null)
 	{
-		$tpl = new static($name);
+		if ($this instanceof \Template)
+		{
+			$tpl = new static($name);
+		}
+		elseif (TL_MODE == 'BE')
+		{
+			$tpl = new \BackendTemplate($name);
+		}
+		else
+		{
+			$tpl = new \FrontendTemplate($name);
+		}
 
 		if ($data !== null)
 		{