diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-04-18 17:22:41 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-04-18 17:22:41 +0000 |
| commit | e3bdaea2656f788dd58e04d62896435246b6f23b (patch) | |
| tree | 35441d4a27d7cf129a162d5348767f5953289beb /phpBB/viewtopic.php | |
| parent | b4388d0ed1a64c58de87bf2dbacf6ff01a099c38 (diff) | |
| download | forums-e3bdaea2656f788dd58e04d62896435246b6f23b.tar forums-e3bdaea2656f788dd58e04d62896435246b6f23b.tar.gz forums-e3bdaea2656f788dd58e04d62896435246b6f23b.tar.bz2 forums-e3bdaea2656f788dd58e04d62896435246b6f23b.tar.xz forums-e3bdaea2656f788dd58e04d62896435246b6f23b.zip | |
Ability to vote in poll is now required for the ability to change existing vote. (Bug #38925)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9470 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index b76f6c5e88..2bc8086efe 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -679,8 +679,8 @@ if (!empty($topic_data['poll_start'])) } } - $s_can_vote = (((!sizeof($cur_voted_id) && $auth->acl_get('f_vote', $forum_id)) || - ($auth->acl_get('f_votechg', $forum_id) && $topic_data['poll_vote_change'])) && + // Can not vote at all if no vote permission + $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; |