diff options
| author | Graham Eames <grahamje@users.sourceforge.net> | 2006-08-20 17:47:47 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2006-08-20 17:47:47 +0000 |
| commit | 49d56f90e5cd5b21192949bd34dd0b2f10aa2921 (patch) | |
| tree | 2f1901f3fb237a889b7a3575c534c272c2e14995 /phpBB/viewtopic.php | |
| parent | 56d517d1be7b85b9a69ad75f4fe7b8278c490248 (diff) | |
| download | forums-49d56f90e5cd5b21192949bd34dd0b2f10aa2921.tar forums-49d56f90e5cd5b21192949bd34dd0b2f10aa2921.tar.gz forums-49d56f90e5cd5b21192949bd34dd0b2f10aa2921.tar.bz2 forums-49d56f90e5cd5b21192949bd34dd0b2f10aa2921.tar.xz forums-49d56f90e5cd5b21192949bd34dd0b2f10aa2921.zip | |
Poll ended at....
git-svn-id: file:///svn/phpbb/trunk@6307 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index e296f80438..9a8b893e59 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -755,6 +755,8 @@ if (!empty($topic_data['poll_start'])) ); } + $poll_end = $topic_data['poll_length'] + $topic_data['poll_start']; + $template->assign_vars(array( 'POLL_QUESTION' => $topic_data['poll_title'], 'TOTAL_VOTES' => $poll_total, @@ -762,7 +764,7 @@ if (!empty($topic_data['poll_start'])) 'POLL_RIGHT_CAP_IMG'=> $user->img('poll_right'), 'L_MAX_VOTES' => ($topic_data['poll_max_options'] == 1) ? $user->lang['MAX_OPTION_SELECT'] : sprintf($user->lang['MAX_OPTIONS_SELECT'], $topic_data['poll_max_options']), - 'L_POLL_LENGTH' => ($topic_data['poll_length']) ? sprintf($user->lang['POLL_RUN_TILL'], $user->format_date($topic_data['poll_length'] + $topic_data['poll_start'])) : '', + 'L_POLL_LENGTH' => ($topic_data['poll_length']) ? sprintf($user->lang[($poll_end > time()) ? 'POLL_RUN_TILL' : 'POLL_ENDED_AT'], $user->format_date($poll_end)) : '', 'S_HAS_POLL' => true, 'S_CAN_VOTE' => $s_can_vote, @@ -773,7 +775,7 @@ if (!empty($topic_data['poll_start'])) 'U_VIEW_RESULTS' => $viewtopic_url . '&view=viewpoll') ); - unset($poll_info, $voted_id); + unset($poll_end, $poll_info, $voted_id); } // If the user is trying to reach the second half of the topic, fetch it starting from the end |