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

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2017-06-24 21:32:14 +02:00
commit d77c018d7f
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/posting.php
View file

@ -1192,6 +1192,11 @@ if ($submit || $preview || $refresh)
{ {
// We have a poll but the editing user is not permitted to create/edit it. // We have a poll but the editing user is not permitted to create/edit it.
// So we just keep the original poll-data. // So we just keep the original poll-data.
// Decode the poll title and options text fisrt.
$original_poll_data['poll_title'] = $bbcode_utils->unparse($original_poll_data['poll_title']);
$original_poll_data['poll_option_text'] = $bbcode_utils->unparse($original_poll_data['poll_option_text']);
$original_poll_data['poll_options'] = explode("\n", $original_poll_data['poll_option_text']);
$poll = array_merge($original_poll_data, array( $poll = array_merge($original_poll_data, array(
'enable_bbcode' => $post_data['enable_bbcode'], 'enable_bbcode' => $post_data['enable_bbcode'],
'enable_urls' => $post_data['enable_urls'], 'enable_urls' => $post_data['enable_urls'],