diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2008-10-10 17:52:14 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2008-10-10 17:52:14 +0000 |
| commit | 55d8d97d2f72615b4113a8f2362c73a99986f8ff (patch) | |
| tree | f38b81ef8e033d2f8fba38a4e05c0acbebef6841 /phpBB | |
| parent | b86722d509042d548de593aa56750f5ca9b432c2 (diff) | |
| download | forums-55d8d97d2f72615b4113a8f2362c73a99986f8ff.tar forums-55d8d97d2f72615b4113a8f2362c73a99986f8ff.tar.gz forums-55d8d97d2f72615b4113a8f2362c73a99986f8ff.tar.bz2 forums-55d8d97d2f72615b4113a8f2362c73a99986f8ff.tar.xz forums-55d8d97d2f72615b4113a8f2362c73a99986f8ff.zip | |
Don't show forum subscription link on categories. #34895
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8994 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/viewforum.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 0ad14f1a51..b8a6b8b297 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -134,6 +134,7 @@ <li>[Fix] Do not show link to user/group profiles if user has no permission to view the linked page and gets a denied message anyway. (Bug #15088)</li> <li>[Fix] Do not display last post link and sort display options for search engines. (Bug #15088)</li> <li>[Fix] Make sure users still get notifications if they set to only be notified by Jabber, but Jabber service disabled. (Bug #29715 - Patch by Paul)</li> + <li>[Fix] Don't show forum subscription link on categories. (Bug #34895)</li> <li>[Change] No longer allow the direct use of MULTI_INSERT in sql_build_array. sql_multi_insert() must be used.</li> <li>[Change] Display warning in ACP if config.php file is left writable.</li> diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 7e53a13ff7..60a6e39c54 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -203,7 +203,7 @@ $s_watching_forum = array( 'is_watching' => false, ); -if (($config['email_enable'] || $config['jab_enable']) && $config['allow_forum_notify'] && $auth->acl_get('f_subscribe', $forum_id)) +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); |