aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Ais <brunoaiss@gmail.com>2013-07-24 12:45:23 +0100
committerBruno Ais <brunoaiss@gmail.com>2013-07-24 12:45:23 +0100
commit4cdccbd42b2f6ee54c6edb7f96ec3a0cac2ae8ea (patch)
tree385d3567a3277e2d5e0f15a52f9c24471580f322
parent6c68348a71891219b039ae98a5a0af2fd52d3956 (diff)
downloadforums-4cdccbd42b2f6ee54c6edb7f96ec3a0cac2ae8ea.tar
forums-4cdccbd42b2f6ee54c6edb7f96ec3a0cac2ae8ea.tar.gz
forums-4cdccbd42b2f6ee54c6edb7f96ec3a0cac2ae8ea.tar.bz2
forums-4cdccbd42b2f6ee54c6edb7f96ec3a0cac2ae8ea.tar.xz
forums-4cdccbd42b2f6ee54c6edb7f96ec3a0cac2ae8ea.zip
[ticket/11638] Removed the unneeded reset.
sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11638
-rw-r--r--phpBB/viewtopic.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 151176fc6f..64006fbe61 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -830,7 +830,7 @@ if (!empty($topic_data['poll_start']))
$parse_bbcode_flags = OPTION_FLAG_SMILIES;
- if(empty($poll_info[0]['bbcode_bitfield']))
+ if (empty($poll_info[0]['bbcode_bitfield']))
{
$parse_bbcode_flags |= OPTION_FLAG_BBCODE;
}
@@ -841,8 +841,6 @@ if (!empty($topic_data['poll_start']))
}
$topic_data['poll_title'] = generate_text_for_display($topic_data['poll_title'], $poll_info[0]['bbcode_uid'], $poll_info[0]['bbcode_bitfield'], $parse_bbcode_flags, true);
-
- unset($parse_bbcode_flags);
foreach ($poll_info as $poll_option)
{