diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-12-04 00:06:06 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-12-04 00:06:06 +0100 |
| commit | 9b9f30bbb94684a73309c6e2dac135f5fa80624c (patch) | |
| tree | e136a89d146ff9afcddf51a63b9ab39ba8c2bbd0 | |
| parent | 74bc2d130d5825f6f94bfbb16fa79d3e155eaadb (diff) | |
| parent | 6f81a2f5b87cbeae08106b3d0c3d105fb2e2af72 (diff) | |
| download | forums-9b9f30bbb94684a73309c6e2dac135f5fa80624c.tar forums-9b9f30bbb94684a73309c6e2dac135f5fa80624c.tar.gz forums-9b9f30bbb94684a73309c6e2dac135f5fa80624c.tar.bz2 forums-9b9f30bbb94684a73309c6e2dac135f5fa80624c.tar.xz forums-9b9f30bbb94684a73309c6e2dac135f5fa80624c.zip | |
Merge branch 'prep-release-3.0.10' into develop-olympus
* prep-release-3.0.10:
[ticket/10503] Debug error "Invalid arguments" when previewing edits
| -rw-r--r-- | phpBB/posting.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index ea3b53e939..76c8100c78 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -895,7 +895,7 @@ if ($submit || $preview || $refresh) $message_parser->parse_poll($poll); - $post_data['poll_options'] = (isset($poll['poll_options'])) ? $poll['poll_options'] : ''; + $post_data['poll_options'] = (isset($poll['poll_options'])) ? $poll['poll_options'] : array(); $post_data['poll_title'] = (isset($poll['poll_title'])) ? $poll['poll_title'] : ''; /* We reset votes, therefore also allow removing options @@ -918,7 +918,8 @@ if ($submit || $preview || $refresh) 'poll_options' => array(), ); - $post_data['poll_options'] = $post_data['poll_title'] = ''; + $post_data['poll_options'] = array(); + $post_data['poll_title'] = ''; $post_data['poll_start'] = $post_data['poll_length'] = $post_data['poll_max_options'] = $post_data['poll_last_vote'] = $post_data['poll_vote_change'] = 0; } else if (!$auth->acl_get('f_poll', $forum_id) && ($mode == 'edit') && ($post_id == $post_data['topic_first_post_id']) && ($original_poll_data['poll_title'] != '')) @@ -934,7 +935,7 @@ if ($submit || $preview || $refresh) $message_parser->parse_poll($poll); - $post_data['poll_options'] = (isset($poll['poll_options'])) ? $poll['poll_options'] : ''; + $post_data['poll_options'] = (isset($poll['poll_options'])) ? $poll['poll_options'] : array(); $post_data['poll_title'] = (isset($poll['poll_title'])) ? $poll['poll_title'] : ''; } else |