diff options
| author | Cesar G <prototech91@gmail.com> | 2014-04-20 10:17:08 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-04-20 10:17:08 -0700 |
| commit | 889f6673b250685634795281fc60dc8a011c0369 (patch) | |
| tree | b7857611f989a9e98d4fbf1e92dcf5d158dea45a /phpBB/viewtopic.php | |
| parent | c31ea7af66d3c38072de2fe6788c8d5d4c5d93f5 (diff) | |
| parent | f1201a8ec5b5b65ebcb24cddda60ea29fb1c222f (diff) | |
| download | forums-889f6673b250685634795281fc60dc8a011c0369.tar forums-889f6673b250685634795281fc60dc8a011c0369.tar.gz forums-889f6673b250685634795281fc60dc8a011c0369.tar.bz2 forums-889f6673b250685634795281fc60dc8a011c0369.tar.xz forums-889f6673b250685634795281fc60dc8a011c0369.zip | |
Merge remote-tracking branch 'PayBas/ticket/12363' into develop-ascraeus
* PayBas/ticket/12363:
[ticket/12363] Fix typo
[ticket/12363] changed _winner_ to _most-votes_
[ticket/12363] Mark winning (most votes) results bar
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index ad7e8c29bc..9dc965240f 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -858,6 +858,7 @@ if (!empty($topic_data['poll_start'])) $option_pct_txt = sprintf("%.1d%%", round($option_pct * 100)); $option_pct_rel = ($poll_most > 0) ? $poll_option['poll_option_total'] / $poll_most : 0; $option_pct_rel_txt = sprintf("%.1d%%", round($option_pct_rel * 100)); + $option_most_votes = ($poll_option['poll_option_total'] > 0 && $poll_option['poll_option_total'] == $poll_most) ? true : false; $template->assign_block_vars('poll_option', array( 'POLL_OPTION_ID' => $poll_option['poll_option_id'], @@ -868,6 +869,7 @@ if (!empty($topic_data['poll_start'])) 'POLL_OPTION_PCT' => round($option_pct * 100), 'POLL_OPTION_WIDTH' => round($option_pct * 250), 'POLL_OPTION_VOTED' => (in_array($poll_option['poll_option_id'], $cur_voted_id)) ? true : false, + 'POLL_OPTION_MOST_VOTES' => $option_most_votes, )); } |