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

[ticket/14802] Empty/blank lines should not be additional poll options

Browse source 
PHPBB3-14802
This commit is contained in:
Daniel Sinn 2016-09-29 14:43:36 -04:00
parent 6972d06f59
commit 0b3951cb81
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/message_parser.php
View file

@ -1822,7 +1822,7 @@ class parse_message extends bbcode_firstpass
$this->message = $poll['poll_title']; $this->message = $poll['poll_title'];
$this->bbcode_bitfield = $bbcode_bitfield; $this->bbcode_bitfield = $bbcode_bitfield;
$poll['poll_options'] = explode("\n", trim($poll['poll_option_text'])); $poll['poll_options'] = preg_split('/\s*?\n\s*/', trim($poll['poll_option_text']));
$poll['poll_options_size'] = sizeof($poll['poll_options']); $poll['poll_options_size'] = sizeof($poll['poll_options']);
if (!$poll['poll_title'] && $poll['poll_options_size']) if (!$poll['poll_title'] && $poll['poll_options_size'])