diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-10-03 20:20:54 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-10-03 20:20:54 +0200 |
| commit | 7bb4e88acdb0f45f8bfbad74b558db65524cbe1a (patch) | |
| tree | be3cd03cf45d1e17e7404c0433e2be9706bc1421 /phpBB/includes/message_parser.php | |
| parent | b28fe0a7fa128e3fc055e8a661673cee894ceee5 (diff) | |
| parent | 1ad64f89b817a42722b522f4a763424eea3b5a5f (diff) | |
| download | forums-7bb4e88acdb0f45f8bfbad74b558db65524cbe1a.tar forums-7bb4e88acdb0f45f8bfbad74b558db65524cbe1a.tar.gz forums-7bb4e88acdb0f45f8bfbad74b558db65524cbe1a.tar.bz2 forums-7bb4e88acdb0f45f8bfbad74b558db65524cbe1a.tar.xz forums-7bb4e88acdb0f45f8bfbad74b558db65524cbe1a.zip | |
Merge branch '3.1.x' into 3.2.x
* 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
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 5b585d4237..c68ff87cd7 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -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) |