diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-12-24 14:34:10 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-12-24 14:34:10 +0100 |
| commit | c9338b38b35675bd1d620e4a8ca7d44a522faace (patch) | |
| tree | 0746db7f0eb5f22780c04e3ece5fb6a549045860 /phpBB/includes/functions_messenger.php | |
| parent | e6aaef6066549696453063417167e5a79c53b353 (diff) | |
| parent | 46b3c3ecc43721e53c9711a196e91c300e03a1c8 (diff) | |
| download | forums-c9338b38b35675bd1d620e4a8ca7d44a522faace.tar forums-c9338b38b35675bd1d620e4a8ca7d44a522faace.tar.gz forums-c9338b38b35675bd1d620e4a8ca7d44a522faace.tar.bz2 forums-c9338b38b35675bd1d620e4a8ca7d44a522faace.tar.xz forums-c9338b38b35675bd1d620e4a8ca7d44a522faace.zip | |
Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatars
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index a18aeddabd..d0a02567ad 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -210,7 +210,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_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context()); + $tpl = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context(), $phpbb_extension_manager); $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; @@ -231,7 +231,7 @@ class messenger } } - $style->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), array(), ''); $tpl->set_filenames(array( 'body' => $template_file . '.txt', |