From 8cd5210f31f876a08330a3cd58de2fba32f87725 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Tue, 30 May 2006 11:02:26 +0000
Subject: - Patch #51561 by dww: fixed broken HTML.

---
 modules/poll.module      | 13 +++++--------
 modules/poll/poll.module | 13 +++++--------
 2 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'modules')

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>';
   }
-- 
cgit v1.2.3