6 files changed, 14 insertions, 14 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index e7168b210b..91894e5aec 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -50,9 +50,9 @@ $file_uploads	= (@ini_get('file_uploads') == '1' || strtolower(@ini_get('file_up
 $module_id		= request_var('i', '');
 $mode			= request_var('mode', '');
 
-// Set custom template for admin area
-$template->set_ext_dir_prefix('adm/');
-$template->set_custom_template($phpbb_admin_path . 'style', 'admin');
+// Set custom style for admin area
+$style->set_ext_dir_prefix('adm/');
+$style->set_custom_style('admin', $phpbb_admin_path . 'style', '');
 $template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets');
 $template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
 
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index 3831cb03ad..5e3bfed5ec 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -133,8 +133,8 @@ class bbcode
 			$this->template_bitfield = new bitfield($user->theme['bbcode_bitfield']);
 
 			$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager);
+			$style->set_style();
 			$template = $style->template;
-			$template->set_template();
 			$template->set_filenames(array('bbcode.html' => 'bbcode.html'));
 			$this->template_filename = $style->locator->get_source_file_for_handle('bbcode.html');
 		}
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 4e1ec160af..a5e7ad75ca 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -201,7 +201,7 @@ class messenger
 		{
 			// fall back to board default language if the user's language is
 			// missing $template_file.  If this does not exist either,
-			// $tpl->set_custom_template will do a trigger_error
+			// $tpl->set_filenames will do a trigger_error
 			$template_lang = basename($config['default_lang']);
 		}
 
@@ -209,8 +209,8 @@ class messenger
 		if (!isset($this->tpl_msg[$template_lang . $template_file]))
 		{
 			$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;
+			$stl = &$this->tpl_msg[$template_lang . $template_file];
+			$tpl = $stl->template;
 
 			$fallback_template_path = false;
 
@@ -228,7 +228,7 @@ class messenger
 				}
 			}
 
-			$tpl->set_custom_template($template_path, $template_lang . '_email', $fallback_template_path);
+			$stl->set_custom_style($template_lang . '_email', array($template_path, $fallback_template_path), '');
 
 			$tpl->set_filenames(array(
 				'body'		=> $template_file . '.txt',
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index f2956243e2..2fd2efe9b2 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -1570,7 +1570,7 @@ class user extends session
 	*/
 	function setup($lang_set = false, $style_id = false)
 	{
-		global $db, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache;
+		global $db, $style, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache;
 
 		if ($this->data['user_id'] != ANONYMOUS)
 		{
@@ -1704,7 +1704,7 @@ class user extends session
 			}
 		}
 
-		$template->set_template();
+		$style->set_style();
 
 		$this->img_lang = $this->lang_name;
 
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 7c6dd10d03..1f013df72b 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -202,9 +202,9 @@ $config = new phpbb_config(array(
 ));
 
 $style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, false);
+$style->set_ext_dir_prefix('adm/');
+$style->set_custom_style('admin', '../adm/style', '');
 $template = $style->template;
-$template->set_ext_dir_prefix('adm/');
-$template->set_custom_template('../adm/style', 'admin');
 $template->assign_var('T_ASSETS_PATH', '../assets');
 $template->assign_var('T_TEMPLATE_PATH', '../adm/style');
 
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index aba692aa62..dcf01e5cc8 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -71,7 +71,7 @@ class install_update extends module
 
 	function main($mode, $sub)
 	{
-		global $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language;
+		global $style, $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language;
 		global $request;
 
 		$this->tpl_name = 'install_update';
@@ -131,7 +131,7 @@ class install_update extends module
 		}
 
 		// Set custom template again. ;)
-		$template->set_custom_template('../adm/style', 'admin');
+		$style->set_custom_style('admin', '../adm/style', '');
 
 		$template->assign_vars(array(
 			'S_USER_LANG'			=> $user->lang['USER_LANG'],