mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[feature/merging-style-components] Updating style initialization

Browse Source 
Changing template initialization to style initialization.

PHPBB3-10632
This commit is contained in:
Vjacheslav Trushkin
2012-03-15 21:11:34 +02:00
parent 1ce4d4c4fc
commit fd96f97dc3
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/bbcode.php
View File

@@ -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');
}

8
phpBB/includes/functions_messenger.php
View File

@@ -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',

4
phpBB/includes/session.php
View File

@@ -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;