diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2009-06-09 18:09:29 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2009-06-09 18:09:29 +0000 |
| commit | 7650b6526f6338236ce41640896015b9e17e4c0f (patch) | |
| tree | c80d929faec6d5760b5e1876e133ecead23fa6db | |
| parent | 1f05faf25c41d940ce1210225e2321b7ccaf0365 (diff) | |
| download | forums-7650b6526f6338236ce41640896015b9e17e4c0f.tar forums-7650b6526f6338236ce41640896015b9e17e4c0f.tar.gz forums-7650b6526f6338236ce41640896015b9e17e4c0f.tar.bz2 forums-7650b6526f6338236ce41640896015b9e17e4c0f.tar.xz forums-7650b6526f6338236ce41640896015b9e17e4c0f.zip | |
Fix a regression introduced in r9470 #45895
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9567 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index d03e186664..0dbf238a3b 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -97,6 +97,7 @@ <li>[Fix] Move post bump information markup to the template. (Bug #34295 - Patch by bantu)</li> <li>[Fix] Show error in the ACP when template folder is not readable. (Bug #45705 - Patch by bantu)</li> <li>[Fix] Adjust viewonline filename regular expression to be less strict. (Bug #46215 - Patch by bantu)</li> + <li>[Fix] Correctly apply the can change vote permission again. Regression intorduced in r9470. (Bug #45895)</li> <li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li> <li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li> <li>[Feature] Backported 3.2 captcha plugins.</li> diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 5af6516095..aedf464248 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -684,7 +684,9 @@ if (!empty($topic_data['poll_start'])) $s_can_vote = ($auth->acl_get('f_vote', $forum_id) && (($topic_data['poll_length'] != 0 && $topic_data['poll_start'] + $topic_data['poll_length'] > time()) || $topic_data['poll_length'] == 0) && $topic_data['topic_status'] != ITEM_LOCKED && - $topic_data['forum_status'] != ITEM_LOCKED) ? true : false; + $topic_data['forum_status'] != ITEM_LOCKED && + (!sizeof($cur_voted_id) || + ($auth->acl_get('f_votechg', $forum_id) && $topic_data['poll_vote_change']))) ? true : false; $s_display_results = (!$s_can_vote || ($s_can_vote && sizeof($cur_voted_id)) || $view == 'viewpoll') ? true : false; if ($update && $s_can_vote) |