- Committed part 3 of Michael's help system improvements: removed the $help

  parameter from the menu() function.

1 files changed, 21 insertions, 20 deletions

diff --git a/modules/user.module b/modules/user.module
index 4c8daaa12..4d0d5a21b 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -496,26 +496,26 @@ function user_link($type) {
   if ($type == "system") {
     global $user;
     if ($user->uid) {
-      menu("user/edit", t("my account"), "user_page", NULL, 8);
-      menu("user/logout", t("log out"), "user_page", NULL, 10);
+      menu("user/edit", t("my account"), "user_page", 8);
+      menu("user/logout", t("log out"), "user_page", 10);
     }
     if (user_access("administer users")) {
-      menu("admin/user", t("accounts"), "user_admin", user_help("admin/user"), 2);
-      menu("admin/user/create", t("new user"), "user_admin", user_help("admin/user/create"), 1);
-      menu("admin/user/account", t("users"), "user_admin", user_help("admin/user/account"), 2);
-      menu("admin/user/access", t("access rules"), NULL, user_help("admin/user/access"), 3);
-      menu("admin/user/access/mail", t("by e-mail"), "user_admin", user_help("admin/user/access/mail"));
-      menu("admin/user/access/user", t("by name"), "user_admin", user_help("admin/user/access/user"));
-      menu("admin/user/role", t("roles"), "user_admin", user_help("admin/user/role"), 4);
-      menu("admin/user/permission", t("permissions"), "user_admin", user_help("admin/user/permission"), 5);
-      menu("admin/user/search", t("search"), "user_admin", user_help("admin/user/search"), 8);
-      menu("admin/user/help", t("help"), "user_help", NULL, 9);
-      menu("admin/user/edit", t("edit user account"), "user_admin", NULL, 0, 1); // hidden menu
-      menu("admin/user/account/1", t("blocked users"), "user_admin", user_help("admin/user/account/1"), 3);
+      menu("admin/user", t("accounts"), "user_admin", 2);
+      menu("admin/user/create", t("new user"), "user_admin", 1);
+      menu("admin/user/account", t("users"), "user_admin", 2);
+      menu("admin/user/access", t("access rules"), NULL, 3);
+      menu("admin/user/access/mail", t("by e-mail"), "user_admin");
+      menu("admin/user/access/user", t("by name"), "user_admin");
+      menu("admin/user/role", t("roles"), "user_admin", 4);
+      menu("admin/user/permission", t("permissions"), "user_admin", 5);
+      menu("admin/user/search", t("search"), "user_admin", 8);
+      menu("admin/user/help", t("help"), "user_help", 9);
+      menu("admin/user/edit", t("edit user account"), "user_admin", 0, 1); // hidden menu
+      menu("admin/user/account/1", t("blocked users"), "user_admin", 3);
 
       $i = 2;
       foreach (user_roles(1) as $key => $value) {
-        menu("admin/user/account/$i", t("users with role '%role'", array("%role" => $value)), "user_admin", user_help("admin/user/account/".$i++), 4);
+        menu("admin/user/account/$i", t("users with role '%role'", array("%role" => $value)), "user_admin", 4);
       }
     }
   }
@@ -1195,7 +1195,7 @@ function user_page() {
       break;
     case "help":
       theme("header");
-      theme("box", t("Distributed authentication"), user_help("user/help"));
+      theme("box", t("Distributed authentication"), user_help("user/help#user"));
       theme("footer");
       break;
     default:
@@ -1692,13 +1692,14 @@ function user_admin() {
   }
 }
 // the following functions comprise help for admins and developers
-function user_help($section = "admin/user/help") {
+function user_help($section = "admin/help#user") {
   $output = "";
 
   switch ($section) {
     case 'admin/user':
       $output .= t("Drupal allows users to register, login, logout, maintain user profiles, etc.  No participant can use his own name to post content until he signs up for a user account.<br />Click on either the \"username\" or \"edit account\" to edit a user's information.");
       break;
+    case 'admin/user/create':
     case 'admin/user/account/create':
       $output .= t("This web page allows the administrators to register a new users by hand.<br />Note:<ul><li>You cannot have a user where either the e-mail address or the username match another user in the system.</li></ul>");
       break;
@@ -1748,7 +1749,7 @@ function user_help($section = "admin/user/help") {
     case 'admin/system/modules/user':
       $output .= t("In order to use the full power of Drupal a visitor must sign up for an account. This page lets you setup how a user signs up, logs out, the guidelines from the system about user subscriptions, and the e-mails the system will send to the user.");
       break;
-    case 'user/help':
+    case 'user/help#user':
       $site = variable_get("site_name", "this website");
 
       $output .= "<h3>Distributed authentication<a id=\"da\"></a></h3>";
@@ -1760,11 +1761,11 @@ function user_help($section = "admin/user/help") {
         foreach (module_list() as $module) {
           if (module_hook($module, "auth")) {
             $output .= "<h4><a id=\"$module\"></a>". module_invoke($module, "info", "name") ."</h4>";
-            $output .= module_invoke($module, "help", "user/help");
+            $output .= module_invoke($module, "help", "user/help#$module");
           }
         }
       break;
-    case 'admin/user/help':
+    case 'admin/help#user':
 
       // Start of user_help_admin
       $output .= "<h3>Introduction</h3><p>Drupal offers a powerful access system that allows users to register, login, logout, maintain user profiles, etc. By using \"%user-role\" you can setup fine grained %user-permission allowing each role to do only what you want them to. Each user is assigned to a role. By default there are two roles \"anonymous\" - a user who has not logged in, and \"authorized\" a user who has signed up and who has been authorized. As anonymous users, participants suffer numerous disadvantages, for example they cannot sign their names to nodes, and their moderated posts beginning at a lower score.</p>";