1 files changed, 16 insertions, 11 deletions
diff --git a/modules/poll.module b/modules/poll.module
index 7c22e041c..d2ac76cbe 100644
--- a/modules/poll.module
+++ b/modules/poll.module
@@ -42,19 +42,24 @@ function poll_access($op, $node) {
   }
 }
 
-function poll_block() {
-  $timestamp = db_result(db_query("SELECT MAX(created) FROM node WHERE type='poll' AND status='1' AND moderate='0'"));
-  if ($timestamp) {
-    $poll = node_load(array("type" => "poll", "created" => $timestamp, "moderate" => "0", "status" => "1"));
-    if ($poll->nid) {
-      // Poll_view dumps the output into $poll->body
-      poll_view($poll, 1, 1);
+function poll_block($op = "list", $delta = 0) {
+  if ($op == "list") {
+    $blocks[0]["info"] = t("Most recent poll");
+    return $blocks;
+  }
+  else {
+    $timestamp = db_result(db_query("SELECT MAX(created) FROM node WHERE type = 'poll' AND status = '1' AND moderate = '0'"));
+    if ($timestamp) {
+      $poll = node_load(array("type" => "poll", "created" => $timestamp, "moderate" => "0", "status" => "1"));
+      if ($poll->nid) {
+        // Poll_view dumps the output into $poll->body
+        poll_view($poll, 1, 1);
+      }
     }
+    $block["subject"] = t("Latest poll: %t", array("%t" => $poll->title));
+    $block["content"] = $poll->body;
+    return $block;
   }
-  $blocks[0][subject] = t("Latest poll: %t", array("%t" => $poll->title));
-  $blocks[0][content] = $poll->body;
-  $blocks[0][info] = t("Most recent poll");
-  return $blocks;
 }
 
 function poll_cron() {