diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-03-26 11:15:36 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-03-26 11:15:36 +0100 |
| commit | 1efbb5b3bbd8c0b38c0f265453514dfd87ef04f0 (patch) | |
| tree | 07f27d0af5f96d14e394ddb9c8d3d0be2cdfc7e6 | |
| parent | 84d77d6cd587d8ae67e7731a00be863096336127 (diff) | |
| parent | 1df97c205dcb0bd19cee5743b21a4647d247a85a (diff) | |
| download | forums-1efbb5b3bbd8c0b38c0f265453514dfd87ef04f0.tar forums-1efbb5b3bbd8c0b38c0f265453514dfd87ef04f0.tar.gz forums-1efbb5b3bbd8c0b38c0f265453514dfd87ef04f0.tar.bz2 forums-1efbb5b3bbd8c0b38c0f265453514dfd87ef04f0.tar.xz forums-1efbb5b3bbd8c0b38c0f265453514dfd87ef04f0.zip | |
Merge pull request #3493 from prototech/ticket/13555
[ticket/13555] Render poll options separately when previewing.
* prototech/ticket/13555:
[ticket/13555] Render poll options separately when previewing.
| -rw-r--r-- | phpBB/posting.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 61df10b125..964b0f1f8b 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1222,9 +1222,13 @@ if (!sizeof($error) && $preview) 'L_MAX_VOTES' => ($post_data['poll_max_options'] == 1) ? $user->lang['MAX_OPTION_SELECT'] : sprintf($user->lang['MAX_OPTIONS_SELECT'], $post_data['poll_max_options'])) ); - $parse_poll->message = implode("\n", $post_data['poll_options']); - $parse_poll->format_display($post_data['enable_bbcode'], $post_data['enable_urls'], $post_data['enable_smilies']); - $preview_poll_options = explode('<br />', $parse_poll->message); + $preview_poll_options = array(); + foreach ($post_data['poll_options'] as $poll_option) + { + $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); foreach ($preview_poll_options as $key => $option) |