Merge branch 'develop' of https://github.com/phpbb/phpbb3 into develop

# By Bruno Ais
# Via Bruno Ais (1) and Joas Schilling (1)
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/11638] Variable names goof...
This commit is contained in:
Joas Schilling 2013-07-30 14:17:46 +02:00
commit 07ba2ed872

View file

@ -832,7 +832,7 @@ if (!empty($topic_data['poll_start']))
$poll_total += $poll_option['poll_option_total']; $poll_total += $poll_option['poll_option_total'];
} }
$parse_flags = ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES; $parse_flags = ($poll_info[0]['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
for ($i = 0, $size = sizeof($poll_info); $i < $size; $i++) for ($i = 0, $size = sizeof($poll_info); $i < $size; $i++)
{ {