diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2011-11-28 10:35:43 +0100 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2011-11-28 10:35:43 +0100 |
commit | f88e89900f34f6165a9002c3a2cb3307310584ee (patch) | |
tree | b02fc0b740f83cba8d0b085959bf04175f93fdea | |
parent | 799be4469a99176bc14cf602c16995c260b10162 (diff) | |
download | forums-f88e89900f34f6165a9002c3a2cb3307310584ee.tar forums-f88e89900f34f6165a9002c3a2cb3307310584ee.tar.gz forums-f88e89900f34f6165a9002c3a2cb3307310584ee.tar.bz2 forums-f88e89900f34f6165a9002c3a2cb3307310584ee.tar.xz forums-f88e89900f34f6165a9002c3a2cb3307310584ee.zip |
[ticket/10503] Debug error "Invalid arguments" when previewing edits
Empty value of poll_options should be an empty array, so that sizeof() is 0.
PHPBB3-9776
PHPBB3-10503
-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 |