From cf3aad78cf902def95335f1e4bb7603126cd9221 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sat, 13 Jun 2009 13:59:45 +0000 Subject: [PATCH] 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 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/posting.php | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 3b55791485..3e6637ae36 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -102,6 +102,7 @@
  • [Fix] Correctly hide skiplink in prosilver right-to-left mode. (Bug #45765 - Patch by prototech and bantu)
  • [Fix] Fix dynamic config update routine error if firebird is used (Bug #46315)
  • [Fix] Allow friends/foes to be added and removed at the same time. (Bug #46255 - Patch by bantu)
    • +
  • [Fix] Only change topic/post icon if icons are enabled and user is allowed to. (Bug #46355 - Patch by bantu)
  • [Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.
  • [Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)
  • [Change] Template engine now permits to a limited extent variable includes.
    • 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;