aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-02-28 10:16:09 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-02-28 10:16:09 +0100
commitf259a451bb99fc138bc3a753ee26903a20de5c54 (patch)
tree74e3d8927974b5192608d3e4dd6aa5f25f39e003 /phpBB/phpbb
parentaf99569432d4a7f451550148a9e5ba1e439abd62 (diff)
parentb490be1f8112a2770f5a34c0c4336477f7b094aa (diff)
downloadforums-f259a451bb99fc138bc3a753ee26903a20de5c54.tar
forums-f259a451bb99fc138bc3a753ee26903a20de5c54.tar.gz
forums-f259a451bb99fc138bc3a753ee26903a20de5c54.tar.bz2
forums-f259a451bb99fc138bc3a753ee26903a20de5c54.tar.xz
forums-f259a451bb99fc138bc3a753ee26903a20de5c54.zip
Merge branch '3.2.x'
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/notification/method/messenger_base.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/notification/method/messenger_base.php b/phpBB/phpbb/notification/method/messenger_base.php
index 8a8e284e13..97bad524e1 100644
--- a/phpBB/phpbb/notification/method/messenger_base.php
+++ b/phpBB/phpbb/notification/method/messenger_base.php
@@ -97,7 +97,7 @@ abstract class messenger_base extends \phpbb\notification\method\base
continue;
}
- $messenger->template($template_dir_prefix . $notification->get_email_template(), $user['user_lang']);
+ $messenger->template($notification->get_email_template(), $user['user_lang'], '', $template_dir_prefix);
$messenger->set_addresses($user);