diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2003-06-29 10:59:36 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2003-06-29 10:59:36 +0000 |
| commit | 4d6a76730501a55e696971845c90f364a3921512 (patch) | |
| tree | 107f63c438532906a5b5ad72576fb3e39d1259ed /phpBB/viewtopic.php | |
| parent | b85637fc1a326803f70dbf8018ed505cb0258010 (diff) | |
| download | forums-4d6a76730501a55e696971845c90f364a3921512.tar forums-4d6a76730501a55e696971845c90f364a3921512.tar.gz forums-4d6a76730501a55e696971845c90f364a3921512.tar.bz2 forums-4d6a76730501a55e696971845c90f364a3921512.tar.xz forums-4d6a76730501a55e696971845c90f364a3921512.zip | |
a few fixes
git-svn-id: file:///svn/phpbb/trunk@4184 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 51938a4923..ddbf82b345 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -538,6 +538,7 @@ if (!empty($poll_start)) ORDER BY poll_option_id'; $result = $db->sql_query($sql); + $poll_info = array(); while ($row = $db->sql_fetchrow($result)) { $poll_info[] = $row; @@ -577,7 +578,7 @@ if (!empty($poll_start)) } $s_can_vote = (((!sizeof($voted_id) && $auth->acl_get('f_vote', $forum_id)) || $auth->acl_get('f_votechg', $forum_id)) && - ($poll_length != 0 && $poll_start + $poll_length > time()) && + (($poll_length != 0 && $poll_start + $poll_length > time()) || ($poll_length == 0)) && $topic_status != ITEM_LOCKED && $forum_status != ITEM_LOCKED) ? true : false; $s_display_results = (!$s_can_vote || ($s_can_vote && sizeof($voted_id)) || $_GET['vote'] = 'viewresult') ? true : false; |