aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/posting.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2009-06-13 13:59:45 +0000
committerAndreas Fischer <bantu@phpbb.com>2009-06-13 13:59:45 +0000
commitcf3aad78cf902def95335f1e4bb7603126cd9221 (patch)
tree74ca653720776e780781698b1399c48dae2d2a91 /phpBB/posting.php
parent75ae7aee971c91e8548aabc93319dfa0789d6164 (diff)
downloadforums-cf3aad78cf902def95335f1e4bb7603126cd9221.tar
forums-cf3aad78cf902def95335f1e4bb7603126cd9221.tar.gz
forums-cf3aad78cf902def95335f1e4bb7603126cd9221.tar.bz2
forums-cf3aad78cf902def95335f1e4bb7603126cd9221.tar.xz
forums-cf3aad78cf902def95335f1e4bb7603126cd9221.zip
Fix bug #46355 - Only change topic/post icon if icons are enabled and user is allowed to.
Authorised by: acydburn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9580 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/posting.php')
-rw-r--r--phpBB/posting.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 99d9a59925..d6d7c4739c 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -606,7 +606,11 @@ if ($submit || $preview || $refresh)
$post_data['orig_topic_type'] = $post_data['topic_type'];
$post_data['topic_type'] = request_var('topic_type', (($mode != 'post') ? (int) $post_data['topic_type'] : POST_NORMAL));
$post_data['topic_time_limit'] = request_var('topic_time_limit', (($mode != 'post') ? (int) $post_data['topic_time_limit'] : 0));
- $post_data['icon_id'] = request_var('icon', 0);
+
+ if ($post_data['enable_icons'] && $auth->acl_get('f_icons', $forum_id))
+ {
+ $post_data['icon_id'] = request_var('icon', (int) $post_data['icon_id']);
+ }
$post_data['enable_bbcode'] = (!$bbcode_status || isset($_POST['disable_bbcode'])) ? false : true;
$post_data['enable_smilies'] = (!$smilies_status || isset($_POST['disable_smilies'])) ? false : true;