From 3997ffac2a2e6f422dcd5cd5bd076edee6fa91dd Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Thu, 15 Mar 2012 13:13:21 +0200
Subject: [feature/merging-style-components] Creating style class

Creating phpbb_style class, changing template initialization to style initialization

PHPBB3-10632
---
 phpBB/includes/functions_messenger.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes/functions_messenger.php')

diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 1fb5f15879..4e1ec160af 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -208,10 +208,9 @@ class messenger
 		// tpl_msg now holds a template object we can use to parse the template file
 		if (!isset($this->tpl_msg[$template_lang . $template_file]))
 		{
-			$template_locator = new phpbb_style_locator();
-			$template_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider());
-			$this->tpl_msg[$template_lang . $template_file] = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $template_locator, $template_path_provider);
+			$this->tpl_msg[$template_lang . $template_file] = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager);
 			$tpl = &$this->tpl_msg[$template_lang . $template_file];
+			$tpl = $tpl->template;
 
 			$fallback_template_path = false;
 
@@ -237,6 +236,7 @@ class messenger
 		}
 
 		$this->tpl_obj = &$this->tpl_msg[$template_lang . $template_file];
+		$this->tpl_obj = $this->tpl_obj->template;
 		$this->vars = &$this->tpl_obj->_rootref;
 		$this->tpl_msg = '';
 
-- 
cgit v1.2.1