From 17989c17a040a28aeeefcf55f6cca054b28c06ed Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sat, 31 Mar 2012 18:10:00 +0300
Subject: [feature/merging-style-components] Moving template initialization out
 of style

Moving template initialization out of style constructor

PHPBB3-10632
---
 tests/template/template_inheritance_test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/template/template_inheritance_test.php')

diff --git a/tests/template/template_inheritance_test.php b/tests/template/template_inheritance_test.php
index aa527a3eb5..3f5ec53953 100644
--- a/tests/template/template_inheritance_test.php
+++ b/tests/template/template_inheritance_test.php
@@ -73,8 +73,8 @@ class phpbb_template_template_inheritance_test extends phpbb_template_template_t
 		$this->parent_template_path = dirname(__FILE__) . '/parent_templates';
 		$this->style_resource_locator = new phpbb_style_path_provider();
 		$this->style_provider = new phpbb_style_path_provider();
-		$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider);
+		$this->template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider);
+		$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template);
 		$this->style->set_custom_style('tests', array($this->template_path, $this->parent_template_path), '');
-		$this->template = $this->style->template;
 	}
 }
-- 
cgit v1.2.1