mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 09:46:46 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'github-cyberalien/ticket/10754' into develop

Browse Source 
* github-cyberalien/ticket/10754:
  [ticket/10754] Changing $style to $phpbb_style
This commit is contained in:
Nils Adermann
2012-04-09 00:35:51 +02:00
parent 26e7dd98b7 57065095d5
commit e57e82d478
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/functions_messenger.php
View File

@@ -211,7 +211,7 @@ class messenger
$style_resource_locator = new phpbb_style_resource_locator();
$style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider());
$tpl = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider);
$stl = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $tpl);
$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $tpl);
$this->tpl_msg[$template_lang . $template_file] = $tpl;
$fallback_template_path = false;
@@ -230,7 +230,7 @@ class messenger
}
}
$stl->set_custom_style($template_lang . '_email', array($template_path, $fallback_template_path), '');
$style->set_custom_style($template_lang . '_email', array($template_path, $fallback_template_path), '');
$tpl->set_filenames(array(
'body' => $template_file . '.txt',

4
phpBB/includes/user.php
View File

@@ -72,7 +72,7 @@ class phpbb_user extends phpbb_session
*/
function setup($lang_set = false, $style_id = false)
{
global $db, $style, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache;
global $db, $phpbb_style, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache;
if ($this->data['user_id'] != ANONYMOUS)
{
@@ -206,7 +206,7 @@ class phpbb_user extends phpbb_session
}
}
$style->set_style();
$phpbb_style->set_style();
$this->img_lang = $this->lang_name;