aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/docs/CHANGELOG.html3
-rw-r--r--phpBB/posting.php5
2 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 4450be81d6..a821985f4c 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -264,7 +264,8 @@ p a {
<li>[Feature] Ability to disable birthdays completely with new board features setting</li>
<li>[Fix] Fix disallowed username check (Bug #13511)</li>
<li>[Fix] Allow for unicode usernames to be pruned (Bug #13643)</li>
- <li>[Fix] Do not copy forum permissions from self(Bug #13663)</li>
+ <li>[Fix] Do not copy forum permissions from self (Bug #13663)</li>
+ <li>[Fix] Allow for polls to work during preview (Bug #13657) - thanks to Thatbitextra</li>
</ul>
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 20a1c9c73b..282f651f43 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1070,10 +1070,11 @@ if (!sizeof($error) && $preview)
$preview_poll_options = explode('<br />', $parse_poll->message);
unset($parse_poll);
- foreach ($preview_poll_options as $option)
+ foreach ($preview_poll_options as $key => $option)
{
$template->assign_block_vars('poll_option', array(
- 'POLL_OPTION_CAPTION' => $option)
+ 'POLL_OPTION_CAPTION' => $option,
+ 'POLL_OPTION_ID' => $key + 1)
);
}
unset($preview_poll_options);