diff options
| author |   Marc Alexander <admin@m-a-styles.de> | 2016-03-13 20:24:41 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-03-13 20:24:41 +0100 |
| commit | 186c5f4f83136b3443f0e677d153c1e6f8ff8a04 (patch) | |
| tree | 78b9aaf2ca697efdb4c5b083d354ed355799acdf /phpBB/phpbb/notification | |
| parent | Merge pull request #4209 from marc1706/ticket/14523 (diff) | |
| parent | Merge pull request #4217 from phpbb-fr-com/ticket/14533 (diff) | |
| download | phpbb-186c5f4f83136b3443f0e677d153c1e6f8ff8a04.tar.gz phpbb-186c5f4f83136b3443f0e677d153c1e6f8ff8a04.tar.bz2 phpbb-186c5f4f83136b3443f0e677d153c1e6f8ff8a04.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/phpbb/notification')
| -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 97bad524e1..812cd6a911 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', + '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); |