1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

Merge branch '3.1.x'

* 3.1.x:
  [ticket/13555] Render poll options separately when previewing.
This commit is contained in:
Andreas Fischer 2015-03-26 11:15:37 +01:00
commit 67d81a1ce6

View File

@ -1525,9 +1525,13 @@ if (!sizeof($error) && $preview)
'L_MAX_VOTES' => $user->lang('MAX_OPTIONS_SELECT', (int) $post_data['poll_max_options']), 'L_MAX_VOTES' => $user->lang('MAX_OPTIONS_SELECT', (int) $post_data['poll_max_options']),
)); ));
$parse_poll->message = implode("\n", $post_data['poll_options']); $preview_poll_options = array();
$parse_poll->format_display($post_data['enable_bbcode'], $post_data['enable_urls'], $post_data['enable_smilies']); foreach ($post_data['poll_options'] as $poll_option)
$preview_poll_options = explode('<br />', $parse_poll->message); {
$parse_poll->message = $poll_option;
$parse_poll->format_display($post_data['enable_bbcode'], $post_data['enable_urls'], $post_data['enable_smilies']);
$preview_poll_options[] = $parse_poll->message;
}
unset($parse_poll); unset($parse_poll);
foreach ($preview_poll_options as $key => $option) foreach ($preview_poll_options as $key => $option)