summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2006-05-30 11:02:26 +0000
committerDries Buytaert <dries@buytaert.net>2006-05-30 11:02:26 +0000
commit8cd5210f31f876a08330a3cd58de2fba32f87725 (patch)
tree31ad4fa39bc2686b62e6709e6e3dde043e93ebf0
parent9a65cabf3bd8254c02cb34d046856319b45a8ad6 (diff)
downloadbrdo-8cd5210f31f876a08330a3cd58de2fba32f87725.tar.gz
brdo-8cd5210f31f876a08330a3cd58de2fba32f87725.tar.bz2
- Patch #51561 by dww: fixed broken HTML.
-rw-r--r--modules/poll.module13
-rw-r--r--modules/poll/poll.module13
2 files changed, 10 insertions, 16 deletions
diff --git a/modules/poll.module b/modules/poll.module
index 9a956e466..d9c4f6f90 100644
--- a/modules/poll.module
+++ b/modules/poll.module
@@ -380,14 +380,11 @@ function theme_poll_results($title, $results, $votes, $links, $block, $nid, $vot
$output .= '<div class="poll">';
$output .= $results;
$output .= '<div class="total">'. t('Total votes: %votes', array('%votes' => $votes)) .'</div>';
- if (isset($vote) && $vote > -1) {
- if (user_access('cancel own vote')) {
- $form['#action'] = url("poll/cancel/$nid");
- $form['choice'] = array('#type' => 'hidden', '#value' => $vote);
- $form['submit'] = array('#type' => 'submit', '#value' => t('Cancel your vote'));
- $output .= drupal_get_form('poll_cancel_form', $form);
- }
- $output .= '</div>';
+ if (isset($vote) && $vote > -1 && user_access('cancel own vote')) {
+ $form['#action'] = url("poll/cancel/$nid");
+ $form['choice'] = array('#type' => 'hidden', '#value' => $vote);
+ $form['submit'] = array('#type' => 'submit', '#value' => t('Cancel your vote'));
+ $output .= drupal_get_form('poll_cancel_form', $form);
}
$output .= '</div>';
}
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index 9a956e466..d9c4f6f90 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -380,14 +380,11 @@ function theme_poll_results($title, $results, $votes, $links, $block, $nid, $vot
$output .= '<div class="poll">';
$output .= $results;
$output .= '<div class="total">'. t('Total votes: %votes', array('%votes' => $votes)) .'</div>';
- if (isset($vote) && $vote > -1) {
- if (user_access('cancel own vote')) {
- $form['#action'] = url("poll/cancel/$nid");
- $form['choice'] = array('#type' => 'hidden', '#value' => $vote);
- $form['submit'] = array('#type' => 'submit', '#value' => t('Cancel your vote'));
- $output .= drupal_get_form('poll_cancel_form', $form);
- }
- $output .= '</div>';
+ if (isset($vote) && $vote > -1 && user_access('cancel own vote')) {
+ $form['#action'] = url("poll/cancel/$nid");
+ $form['choice'] = array('#type' => 'hidden', '#value' => $vote);
+ $form['submit'] = array('#type' => 'submit', '#value' => t('Cancel your vote'));
+ $output .= drupal_get_form('poll_cancel_form', $form);
}
$output .= '</div>';
}