diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-10-29 13:39:34 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-10-29 13:39:34 +0000 |
| commit | 04ebbeca3fa00b3f11493c68d393405aeb90ed09 (patch) | |
| tree | 6932cdbc1a7e0ad1ef7f1e4e5fb2b7e907b262e8 /phpBB/viewtopic.php | |
| parent | 2adef2c45775bc1eb957cbfd3825eff743568b92 (diff) | |
| download | forums-04ebbeca3fa00b3f11493c68d393405aeb90ed09.tar forums-04ebbeca3fa00b3f11493c68d393405aeb90ed09.tar.gz forums-04ebbeca3fa00b3f11493c68d393405aeb90ed09.tar.bz2 forums-04ebbeca3fa00b3f11493c68d393405aeb90ed09.tar.xz forums-04ebbeca3fa00b3f11493c68d393405aeb90ed09.zip | |
'1' might not have been a good choice
git-svn-id: file:///svn/phpbb/trunk@8216 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index c44d413f60..f99278aece 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -654,13 +654,25 @@ if (!empty($topic_data['poll_start'])) if ($update && $s_can_vote) { - if (!sizeof($voted_id) || sizeof($voted_id) > $topic_data['poll_max_options']) + + if (!sizeof($voted_id) || sizeof($voted_id) > $topic_data['poll_max_options'] || in_array(VOTE_CONVERTED, $cur_voted_id)) { $redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&start=$start"); meta_refresh(5, $redirect_url); - - $message = (!sizeof($voted_id)) ? 'NO_VOTE_OPTION' : 'TOO_MANY_VOTE_OPTIONS'; + if (!sizeof($voted_id)) + { + $message = 'NO_VOTE_OPTION'; + } + else if (sizeof($voted_id) > $topic_data['poll_max_options']) + { + $message = 'TOO_MANY_VOTE_OPTIONS'; + } + else + { + $message = 'VOTE_CONVERTED'; + } + $message = $user->lang[$message] . '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $redirect_url . '">', '</a>'); trigger_error($message); } |