diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-06-05 00:53:39 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-06-05 00:53:39 +0000 |
| commit | 6ca40653e93c5e544911b8c53348f9a7dd0b9771 (patch) | |
| tree | 34af43b768d73d78b7b804779b6e5ee752e68d1b /phpBB/viewforum.php | |
| parent | d806c0a55ff7d829902cb9c09851a3e73d254bd1 (diff) | |
| download | forums-6ca40653e93c5e544911b8c53348f9a7dd0b9771.tar forums-6ca40653e93c5e544911b8c53348f9a7dd0b9771.tar.gz forums-6ca40653e93c5e544911b8c53348f9a7dd0b9771.tar.bz2 forums-6ca40653e93c5e544911b8c53348f9a7dd0b9771.tar.xz forums-6ca40653e93c5e544911b8c53348f9a7dd0b9771.zip | |
A few minor updates
git-svn-id: file:///svn/phpbb/trunk@4080 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewforum.php')
| -rw-r--r-- | phpBB/viewforum.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 12b72b5bae..cd3b6ee532 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -187,8 +187,12 @@ if ($forum_data['forum_type'] == FORUM_POST) // Forum rules, subscription info and word censors $s_watching_forum = $s_watching_forum_img = ''; - $notify_status = (isset($forum_data['notify_status'])) ? $forum_data['notify_status'] : NULL; - watch_topic_forum('forum', $s_watching_forum, $s_watching_forum_img, $user->data['user_id'], $forum_id, $notify_status); + + if ($config['email_enable'] && $config['allow_forum_notify']) + { + $notify_status = (isset($forum_data['notify_status'])) ? $forum_data['notify_status'] : NULL; + watch_topic_forum('forum', $s_watching_forum, $s_watching_forum_img, $user->data['user_id'], $forum_id, $notify_status); + } $s_forum_rules = ''; gen_forum_rules('forum', $forum_id); @@ -549,7 +553,7 @@ if ($forum_data['forum_type'] == FORUM_POST) // after reading a topic if ($user->data['user_id'] != ANONYMOUS && $update_forum) { - markread('mark', $forum_id, false, time()); + markread('mark', $forum_id); } } |