From a81c857c96ee1a2a9be559ff3c9b71ca9514287e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 14 Sep 2010 13:20:38 +0200 Subject: [ticket/9162] BBCode in poll options is broken, when posting without question. PHPBB3-9162 --- phpBB/posting.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/posting.php') diff --git a/phpBB/posting.php b/phpBB/posting.php index 8cacac2910..7c36f40ca7 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1297,7 +1297,7 @@ $attachment_data = $message_parser->attachment_data; $filename_data = $message_parser->filename_data; $post_data['post_text'] = $message_parser->message; -if (sizeof($post_data['poll_options']) && $post_data['poll_title']) +if (sizeof($post_data['poll_options']) || $post_data['poll_title']) { $message_parser->message = $post_data['poll_title']; $message_parser->bbcode_uid = $post_data['bbcode_uid']; -- cgit v1.2.1 From ffd9437948e4e5cb20005f8f60913f8d80805995 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 14 Sep 2010 13:10:50 +0200 Subject: [ticket/9820] phpBB Debug Error when trying to post a new topic. Regression from aa4519fb44f4ff83e923c6cc4d5bde3f20082340 PHPBB3-9820 PHPBB3-7260 --- phpBB/posting.php | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'phpBB/posting.php') diff --git a/phpBB/posting.php b/phpBB/posting.php index 8cacac2910..a793159a2d 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -402,15 +402,18 @@ if ($post_data['poll_start']) $db->sql_freeresult($result); } -$original_poll_data = array( - 'poll_title' => $post_data['poll_title'], - 'poll_length' => $post_data['poll_length'], - 'poll_max_options' => $post_data['poll_max_options'], - 'poll_option_text' => implode("\n", $post_data['poll_options']), - 'poll_start' => $post_data['poll_start'], - 'poll_last_vote' => $post_data['poll_last_vote'], - 'poll_vote_change' => $post_data['poll_vote_change'], -); +if ($mode == 'edit') +{ + $original_poll_data = array( + 'poll_title' => $post_data['poll_title'], + 'poll_length' => $post_data['poll_length'], + 'poll_max_options' => $post_data['poll_max_options'], + 'poll_option_text' => implode("\n", $post_data['poll_options']), + 'poll_start' => $post_data['poll_start'], + 'poll_last_vote' => $post_data['poll_last_vote'], + 'poll_vote_change' => $post_data['poll_vote_change'], + ); +} $orig_poll_options_size = sizeof($post_data['poll_options']); -- cgit v1.2.1