aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-12-13 20:34:31 +0100
committerAndreas Fischer <bantu@phpbb.com>2012-12-13 20:34:31 +0100
commit28fb9ed080de5f6d08e76225e0baf3551fa6da58 (patch)
treee8dd9dcb9f9b62c4010492228f3bd59096197129
parent86e4a3ddfdfc2514076d3b075d4b34c6b106126b (diff)
parentec074eb97c2b2dc490089782420b065f4c1274cb (diff)
downloadforums-28fb9ed080de5f6d08e76225e0baf3551fa6da58.tar
forums-28fb9ed080de5f6d08e76225e0baf3551fa6da58.tar.gz
forums-28fb9ed080de5f6d08e76225e0baf3551fa6da58.tar.bz2
forums-28fb9ed080de5f6d08e76225e0baf3551fa6da58.tar.xz
forums-28fb9ed080de5f6d08e76225e0baf3551fa6da58.zip
Merge remote-tracking branch 'EXreaction/ticket/11263' into develop
* EXreaction/ticket/11263: [ticket/11263] Fix PHP Notice: Undefined variable: extension_manager
-rw-r--r--phpBB/includes/functions_messenger.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index a33d7f0aa3..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(), $extension_manager);
+ $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;