diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-12-04 00:06:14 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-12-04 00:06:14 +0100 |
| commit | 7d47670c23ecc38decda0a70d78e4d992239fdaf (patch) | |
| tree | c5e67732fa7567da9affe67f0c837072889d0aba /phpBB | |
| parent | 9668420554360ec215c71f85c1eb238fc9ae6a4f (diff) | |
| parent | 9b9f30bbb94684a73309c6e2dac135f5fa80624c (diff) | |
| download | forums-7d47670c23ecc38decda0a70d78e4d992239fdaf.tar forums-7d47670c23ecc38decda0a70d78e4d992239fdaf.tar.gz forums-7d47670c23ecc38decda0a70d78e4d992239fdaf.tar.bz2 forums-7d47670c23ecc38decda0a70d78e4d992239fdaf.tar.xz forums-7d47670c23ecc38decda0a70d78e4d992239fdaf.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10503] Debug error "Invalid arguments" when previewing edits
Diffstat (limited to 'phpBB')
| -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 eef186c377..0ed540679a 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -893,7 +893,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 @@ -916,7 +916,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'] != '')) @@ -932,7 +933,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 |