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/viewforum.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/viewforum.php')
| -rw-r--r-- | phpBB/viewforum.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 929e6fcaa2..fa1ecf841e 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -212,7 +212,7 @@ $s_watching_forum = array( if (($config['email_enable'] || $config['jab_enable']) && $config['allow_forum_notify'] && $forum_data['forum_type'] == FORUM_POST && $auth->acl_get('f_subscribe', $forum_id)) { $notify_status = (isset($forum_data['notify_status'])) ? $forum_data['notify_status'] : NULL; - watch_topic_forum('forum', $s_watching_forum, $user->data['user_id'], $forum_id, 0, $notify_status); + watch_topic_forum('forum', $s_watching_forum, $user->data['user_id'], $forum_id, 0, $notify_status, $start, $forum_data['forum_name']); } $s_forum_rules = ''; |