mirror of
https://github.com/phpbb/phpbb.git
synced 2025-03-24 17:40:43 +01:00
Merge pull request #4856 from rxu/ticket/15252
[ticket/15252] Fix editing a topic with poll by user not permitted to edit poll
This commit is contained in:
commit
909976f076
@ -1192,6 +1192,11 @@ if ($submit || $preview || $refresh)
|
||||
{
|
||||
// We have a poll but the editing user is not permitted to create/edit it.
|
||||
// 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(
|
||||
'enable_bbcode' => $post_data['enable_bbcode'],
|
||||
'enable_urls' => $post_data['enable_urls'],
|
||||
|
Loading…
x
Reference in New Issue
Block a user