diff options
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 3 | ||||
| -rw-r--r-- | phpBB/includes/functions_posting.php | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 76795d1c22..e49e0f30f2 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -107,6 +107,9 @@ <li>[Fix] Use correct dimension (width x height) in ACP (Bug #14452)</li> <li>[Fix] Only display PM history links if there are PM's to be displayed (Bug #14484)</li> <li>[Feature] Added completely new hook system to allow better application/mod integration - see docs/hook_system.html</li> + <li>[Fix] Correctly delete excess poll options (Bug #14566)</li> + <li>[Fix] Allow names evaluating to false for poll options</li> + </ul> <a name="v30rc4"></a><h3>1.ii. Changes since 3.0.RC4</h3> diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 6663acb5e2..a3030029c5 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -1932,7 +1932,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u $sql_insert_ary = array(); for ($i = 0, $size = sizeof($poll['poll_options']); $i < $size; $i++) { - if (trim($poll['poll_options'][$i])) + if (strlen(trim($poll['poll_options'][$i]))) { if (empty($cur_poll_options[$i])) { @@ -1959,7 +1959,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u if (sizeof($poll['poll_options']) < sizeof($cur_poll_options)) { $sql = 'DELETE FROM ' . POLL_OPTIONS_TABLE . ' - WHERE poll_option_id >= ' . sizeof($poll['poll_options']) . ' + WHERE poll_option_id > ' . sizeof($poll['poll_options']) . ' AND topic_id = ' . $data['topic_id']; $db->sql_query($sql); } |