- Help system improvements: eliminated the _system hook. Patch by Michael.

- Bloggerapi module fixes.  Patch by Kjartan.

- Coding style fixes.  Patch by Michael.

1 files changed, 3 insertions, 11 deletions

diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index 89d6bb2be..ccfa3011b 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -151,9 +151,9 @@ function poll_help($section = "admin/poll/help") {
       $output .= "<li>To administer polls you need the \"administer nodes\" permission.</li>";
       $output .= "</ul>";
       $output .= "<p>Creating a poll is much like creating any other node. Click \"create poll\" in your user box. The title of the poll should be the question, then enter the answers and the \"base\" vote counts. You can also choose the time period over which the vote will run.</p><p>The %poll item in the navigation links will take you to a page where you can see all the current polls, vote on them (if you haven't already) and view the results.</p>";
-      $output = t($output, array("%permissions" => l(t("permissions"), "admin/user/permission"), "%poll" => l(t("Poll"), "poll") ));
+      $output = t($output, array("%permissions" => l(t("permissions"), "admin/user/permission"), "%poll" => l(t("Poll"), "poll")));
       break;
-    case 'admin/system/modules':
+    case 'admin/system/modules#description':
       $output = t("Enables your site to capture votes on different topics in the form of multiple choice questions.");
       break;
   }
@@ -182,7 +182,7 @@ function poll_link($type, $node = 0, $main) {
 
   if ($type == "system") {
     if (user_access("create polls")) {
-      menu("node/add/poll",t("poll"), "poll_page", NULL, 0);
+      menu("node/add/poll", t("poll"), "poll_page", NULL, 0);
     }
   }
   else if ($type == "page" && user_access("access content")) {
@@ -262,14 +262,6 @@ function poll_perm() {
   return array("create polls", "vote on polls");
 }
 
-function poll_system($field){
-  $output = "";
-
-  if ($field == "description") { $output = poll_help("admin/system/modules"); };
-
-  return $output;
-}
-
 function poll_teaser($node) {
   // Create a simple teaser that lists all the choices
   if (is_array($node->choice)) {