diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-08-16 21:02:52 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-08-16 21:02:52 +0200 |
| commit | 723d9d8e4c9f397eab7af77e6e6bd851354a9dcd (patch) | |
| tree | 6ce1fbfff24279076081c835e54323160ba81d22 /phpBB | |
| parent | c044a41d071bd694cd1517ff81a36c7c17243853 (diff) | |
| parent | 488fd8f54c1ef7f1703942477d014ac071e5cc56 (diff) | |
| download | forums-723d9d8e4c9f397eab7af77e6e6bd851354a9dcd.tar forums-723d9d8e4c9f397eab7af77e6e6bd851354a9dcd.tar.gz forums-723d9d8e4c9f397eab7af77e6e6bd851354a9dcd.tar.bz2 forums-723d9d8e4c9f397eab7af77e6e6bd851354a9dcd.tar.xz forums-723d9d8e4c9f397eab7af77e6e6bd851354a9dcd.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB')
| -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 812cd6a911..1f5525accc 100644 --- a/phpBB/phpbb/notification/method/messenger_base.php +++ b/phpBB/phpbb/notification/method/messenger_base.php @@ -104,7 +104,7 @@ abstract class messenger_base extends \phpbb\notification\method\base $messenger->assign_vars(array_merge(array( 'USERNAME' => $user['username'], - 'U_NOTIFICATION_SETTINGS' => generate_board_url() . '/ucp.' . $this->php_ext . '?i=ucp_notifications&mode=notification_options', + 'U_NOTIFICATION_SETTINGS' => generate_board_url() . '/ucp.' . $this->php_ext . '?i=ucp_notifications&mode=notification_options', ), $notification->get_email_template_variables())); $messenger->send($notify_method); |