diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-04-09 00:35:51 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-04-09 00:35:51 +0200 |
| commit | e57e82d478feccc3a995b71118663e7f65c02ea7 (patch) | |
| tree | f4ede5ef46c0ffa2e12c1925849d73e8cfc34dcd /phpBB/includes | |
| parent | 26e7dd98b71655c7e09be02ebd3ef84765ce27b8 (diff) | |
| parent | 57065095d570f0ff5976470ce81a4b216fe5f98e (diff) | |
| download | forums-e57e82d478feccc3a995b71118663e7f65c02ea7.tar forums-e57e82d478feccc3a995b71118663e7f65c02ea7.tar.gz forums-e57e82d478feccc3a995b71118663e7f65c02ea7.tar.bz2 forums-e57e82d478feccc3a995b71118663e7f65c02ea7.tar.xz forums-e57e82d478feccc3a995b71118663e7f65c02ea7.zip | |
Merge remote-tracking branch 'github-cyberalien/ticket/10754' into develop
* github-cyberalien/ticket/10754:
[ticket/10754] Changing $style to $phpbb_style
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/user.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index aae200df55..f608c95fe4 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -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', diff --git a/phpBB/includes/user.php b/phpBB/includes/user.php index 1676f82ccb..ce9c804f23 100644 --- a/phpBB/includes/user.php +++ b/phpBB/includes/user.php @@ -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; |