diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-02-28 10:15:47 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-02-28 10:15:47 +0100 |
| commit | b490be1f8112a2770f5a34c0c4336477f7b094aa (patch) | |
| tree | 92acf5d793762457770e2067d9bdf8ffe404aa5d /phpBB/phpbb/notification/method | |
| parent | cb6ae863f56efe62b1f5c5d4ea3a9e3a12cf4c7b (diff) | |
| parent | a4040e53b72620bc55327d1074a36e2782fc4426 (diff) | |
| download | forums-b490be1f8112a2770f5a34c0c4336477f7b094aa.tar forums-b490be1f8112a2770f5a34c0c4336477f7b094aa.tar.gz forums-b490be1f8112a2770f5a34c0c4336477f7b094aa.tar.bz2 forums-b490be1f8112a2770f5a34c0c4336477f7b094aa.tar.xz forums-b490be1f8112a2770f5a34c0c4336477f7b094aa.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/phpbb/notification/method')
| -rw-r--r-- | phpBB/phpbb/notification/method/messenger_base.php | 2 |
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); |