diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-05-06 19:11:06 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-05-06 19:11:06 +0000 |
| commit | 919c1aee53cd16529e10294e5129ed7e477740af (patch) | |
| tree | 97459d56e7029800e7305c1af88332ebd5b115a6 /phpBB | |
| parent | 5deee5b426eacea0ba63b83d3b15d2a11e994d9e (diff) | |
| download | forums-919c1aee53cd16529e10294e5129ed7e477740af.tar forums-919c1aee53cd16529e10294e5129ed7e477740af.tar.gz forums-919c1aee53cd16529e10294e5129ed7e477740af.tar.bz2 forums-919c1aee53cd16529e10294e5129ed7e477740af.tar.xz forums-919c1aee53cd16529e10294e5129ed7e477740af.zip | |
#10567
git-svn-id: file:///svn/phpbb/trunk@7490 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/mcp/mcp_topic.php | 2 | ||||
| -rw-r--r-- | phpBB/posting.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index ba9c681d4e..7f76449316 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -203,7 +203,7 @@ function mcp_topic_view($id, $mode, $action) { $to_topic_info = $to_topic_info[$to_topic_id]; - if (!$to_topic_info['enable_icons']) + if (!$to_topic_info['enable_icons'] || $auth->acl_get('!f_icons', $forum_id)) { $s_topic_icons = false; } diff --git a/phpBB/posting.php b/phpBB/posting.php index 726fd8bfd1..bfb90d0974 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1110,7 +1110,7 @@ if ($mode == 'post' || ($mode == 'edit' && $post_id == $post_data['topic_first_p } $s_topic_icons = false; -if ($post_data['enable_icons']) +if ($post_data['enable_icons'] && $auth->acl_get('f_icons', $forum_id)) { $s_topic_icons = posting_gen_topic_icons($mode, $post_data['icon_id']); } |