diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-09-14 16:58:35 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-09-14 16:58:35 +0200 |
| commit | 85e32046e3d791eb015cfd8a07f16eb910475fd6 (patch) | |
| tree | bf7e440d846748c8c782df8f3dfc4343a714fc74 /phpBB/posting.php | |
| parent | 3e8d45910dce4f6e6dcdf8103bda8c3ce1b5b582 (diff) | |
| parent | 20460dc12c04a8d946acd54816c220595aa83214 (diff) | |
| download | forums-85e32046e3d791eb015cfd8a07f16eb910475fd6.tar forums-85e32046e3d791eb015cfd8a07f16eb910475fd6.tar.gz forums-85e32046e3d791eb015cfd8a07f16eb910475fd6.tar.bz2 forums-85e32046e3d791eb015cfd8a07f16eb910475fd6.tar.xz forums-85e32046e3d791eb015cfd8a07f16eb910475fd6.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9820] phpBB Debug Error when trying to post a new topic.
[ticket/9162] BBCode in poll options is broken, when posting without question.
[ticket/9804] Update docs/AUTHORS. Move DavidMJ, add evil<3.
Diffstat (limited to 'phpBB/posting.php')
| -rw-r--r-- | phpBB/posting.php | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 8cacac2910..853ac18aad 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']); @@ -1297,7 +1300,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']; |