mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source 
* 3.1.x:
  [ticket/14802] Add test for empty/blank lines in poll options
  [ticket/14802] Empty/blank lines should not be additional poll options
This commit is contained in:
Tristan Darricau
2016-10-03 20:20:54 +02:00
parent b28fe0a7fa 1ad64f89b8
commit 7bb4e88acd
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/message_parser.php
View File

@@ -1860,7 +1860,7 @@ class parse_message extends bbcode_firstpass
// Parse Poll Option text
$tmp_message = $this->message;
$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']);
foreach ($poll['poll_options'] as &$poll_option)