makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1624 from brunoais/ticket/11638

Browse source 
[ticket/11638] Changed the layout to match the other similar commits
This commit is contained in:
Joas Schilling 2013-07-29 09:09:07 -07:00
commit 49d908e959
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/viewtopic.php
View file

@ -832,19 +832,14 @@ if (!empty($topic_data['poll_start']))
$poll_total += $poll_option['poll_option_total']; $poll_total += $poll_option['poll_option_total'];
} }
$parse_bbcode_flags = OPTION_FLAG_SMILIES; $parse_flags = ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
if (empty($poll_info[0]['bbcode_bitfield']))
{
$parse_bbcode_flags |= OPTION_FLAG_BBCODE;
}
for ($i = 0, $size = sizeof($poll_info); $i < $size; $i++) for ($i = 0, $size = sizeof($poll_info); $i < $size; $i++)
{ {
$poll_info[$i]['poll_option_text'] = generate_text_for_display($poll_info[$i]['poll_option_text'], $poll_info[$i]['bbcode_uid'], $poll_option['bbcode_bitfield'], $parse_bbcode_flags, true); $poll_info[$i]['poll_option_text'] = generate_text_for_display($poll_info[$i]['poll_option_text'], $poll_info[$i]['bbcode_uid'], $poll_option['bbcode_bitfield'], $parse_flags, true);
} }
$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); $topic_data['poll_title'] = generate_text_for_display($topic_data['poll_title'], $poll_info[0]['bbcode_uid'], $poll_info[0]['bbcode_bitfield'], $parse_flags, true);
foreach ($poll_info as $poll_option) foreach ($poll_info as $poll_option)
{ {