- 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, 6 insertions, 15 deletions

diff --git a/modules/node.module b/modules/node.module
index 5b495e145..995521a73 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -31,26 +31,26 @@ function node_help($section = "admin/node/help") {
       $output .= "<dt>Published</dt><dd>When using Drupal's moderation system a node remains unpublished -- unavaliable to non-moderators -- until it is marked Published.</dd></dl>";
       $output .= "<p>Now that you know what is in a node, here are some of the types of nodes available.</p>";
 
-      $output = t($output, array("%teaser" => l(t("click here"), "admin/system/modules/node"), "%queue" => l(t("click here"), "admin/system/modules/queue") ));
+      $output = t($output, array("%teaser" => l(t("click here"), "admin/system/modules/node"), "%queue" => l(t("click here"), "admin/system/modules/queue")));
 
       if ($mod == "admin") {
         foreach (module_list() as $name) {
           if (module_hook($name, "node") && $name != "node") {
-            $output .= "<h3>". t("Node type: %module", array("%module" => module_invoke($name, "node", "name"))). "</h3>";
+            $output .= "<h3>". t("Node type: %module", array("%module" => module_invoke($name, "node", "name"))) ."</h3>";
             $output .= module_invoke($name, "node", "description");
           }
         }
       }
       break;
 
-    case 'admin/system/modules':
+    case 'admin/system/modules#description':
       $output = t("The core that allows content to be submitted to the site.");
       break;
     case 'admin/system/modules/node':
       $output = t("Settings for the core of Drupal. Almost everything is a node so these settings will affect most of the site.");
       break;
     case 'admin/node':
-      $output = t("Below is a list of all of the nodes in your site. Other forms of content are listed elsewhere (e.g. %comment).<br />Clicking a title views that node, while clicking an author's name edits their user information.<br />Other node-related tasks are available from the menu on the left.",array("%comments" => l(t("comments"), "admin/comment") ));
+      $output = t("Below is a list of all of the nodes in your site. Other forms of content are listed elsewhere (e.g. %comment).<br />Clicking a title views that node, while clicking an author's name edits their user information.<br />Other node-related tasks are available from the menu on the left.", array("%comments" => l(t("comments"), "admin/comment")));
       break;
     case 'admin/node/search':
       $output = t("Enter a simple pattern to search for a post. This can include the wildcard character *.<br />For example, a search for \"br*\" might return \"bread bakers\", \"our daily bread\" and \"brenda\".");
@@ -64,15 +64,6 @@ function node_help($section = "admin/node/help") {
   return $output;
 }
 
-function node_system($field){
-  $output = "";
-
-  if ($field == "description") {$output = node_help("admin/system/modules"); }
-  else if ($field == "admin_help") {$output = node_help("admin/system/modules/node");};
-
-  return $output;
-}
-
 /*
 ** Accepts a DB result object which can be used to fetch node objects.
 ** Returns an HTML list suitable as content for a block.
@@ -464,7 +455,7 @@ function node_access($op, $node = 0) {
 
   // Can't use node_invoke:
   // the access hook takes the $op parameter before the $node parameter.
-  return module_invoke ($type, "access", $op, $node);
+  return module_invoke($type, "access", $op, $node);
 }
 
 function node_perm() {
@@ -698,7 +689,7 @@ function node_admin_nodes() {
   */
 
   $result = pager_query("SELECT n.*, u.name, u.uid FROM {node} n INNER JOIN {users} u ON n.uid = u.uid ". $filters[$filter][1], 50);
-  $header = array(NULL, t("title"), t("type"), t("author"), t("status"), array ("data" => t("operations"), "colspan" => 2));
+  $header = array(NULL, t("title"), t("type"), t("author"), t("status"), array("data" => t("operations"), "colspan" => 2));
 
   while ($node = db_fetch_object($result)) {
     $rows[] = array(form_checkbox(NULL, "status][$node->nid", 1, 0), l($node->title, "node/view/$node->nid") ." ". (node_is_new($node->nid, $node->changed) ? theme_mark() : ""), module_invoke($node->type, "node", "name"), format_name($node), ($node->status ? t("published") : t("not published")), l(t("edit node"), "admin/node/edit/$node->nid"), l(t("delete node"), "admin/node/delete/$node->nid"));