diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-07-16 21:57:16 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-07-16 21:57:16 -0400 |
| commit | 19925ad059a31282467c061a76fb387d2206b357 (patch) | |
| tree | fd4669d020544b0ffd41c5696b723904cd2858e7 /phpBB/viewtopic.php | |
| parent | 6291a376445f433b8d05a77c6a0c196aecad04fd (diff) | |
| parent | b3cdd1d16981c5992d1bffb97786084f9f02cad1 (diff) | |
| download | forums-19925ad059a31282467c061a76fb387d2206b357.tar forums-19925ad059a31282467c061a76fb387d2206b357.tar.gz forums-19925ad059a31282467c061a76fb387d2206b357.tar.bz2 forums-19925ad059a31282467c061a76fb387d2206b357.tar.xz forums-19925ad059a31282467c061a76fb387d2206b357.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10237] Also display login-box on subscribing
[ticket/10237] Handle watching and unwatching the same way.
[ticket/10237] Use confirm-box to handle unwatching a forum/topic actions
Conflicts:
phpBB/includes/functions_display.php
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index c8768e9ff4..c5189a04df 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -449,7 +449,7 @@ $s_watching_topic = array( if (($config['email_enable'] || $config['jab_enable']) && $config['allow_topic_notify'] && $user->data['is_registered']) { - watch_topic_forum('topic', $s_watching_topic, $user->data['user_id'], $forum_id, $topic_id, $topic_data['notify_status'], $start); + watch_topic_forum('topic', $s_watching_topic, $user->data['user_id'], $forum_id, $topic_id, $topic_data['notify_status'], $start, $topic_data['topic_title']); // Reset forum notification if forum notify is set if ($config['allow_forum_notify'] && $auth->acl_get('f_subscribe', $forum_id)) |