From 1a5fcacdd9d6831a01d8eab8f49674c59c25cb80 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 9 Oct 2003 18:53:22 +0000
Subject: - Committed part 3 of Michael's help system improvements: removed the
 $help   parameter from the menu() function.

---
 modules/system/system.module | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'modules/system/system.module')

diff --git a/modules/system/system.module b/modules/system/system.module
index 11680ee19..cc0860468 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1,24 +1,25 @@
 <?php
 // $Id$
 
-function system_help($section = "admin/system/help") {
+function system_help($section = "admin/help#system") {
   global $base_url;
   $output = "";
 
   switch ($section) {
-    case "admin/system":
+    case 'admin/system':
       $output = t("General configuration options for your site. Set up the name of the site, e-mail address used in mail-outs, clean URL options, caching, etc.");
       break;
-    case "admin/system/themes":
+    case 'admin/system/themes':
       $output = t("Select which themes are available to your users and specify the default theme.");
       break;
-    case "admin/system/modules":
+    case 'admin/system/modules':
       $output = t("Modules are plugins for Drupal that extend its core functionality.  Here you can select which modules are enabled. On the left hand side click on the name of the module for their individual configurations.  Once a module is enabled, you will need to grant permissions to users in user management.");
       break;
-    case "admin/system/filters":
+    case 'admin/system/filters':
       $output = t("Filters fit between the raw text in a node and the HTML output. They allow you to replace text selectively. Uses include automatic conversion of emoticons into graphics and filtering HTML content from users' submissions.");
       break;
-    case "admin/system/help":
+    case 'admin/help#system':
+    case 'admin/system/help':
       $output .= "<p>Drupal comes with system-wide defaults but the setting-module provides control over many Drupal preferences, behaviours including visual and operational settings.</p>";
       $output .= "<h3><a id=\"cron\">Cron</a></h3>";
       // Start of system_help_cron
@@ -53,8 +54,8 @@ function system_link($type) {
   if ($type == "system") {
     if (user_access("administer site configuration")) {
 
-      menu("admin/system", t("configuration"), "system_admin", system_help("admin/system"), 3);
-      menu("admin/system/themes", t("themes"), "system_admin", system_help("admin/system/themes"), 2);
+      menu("admin/system", t("configuration"), "system_admin", 3);
+      menu("admin/system/themes", t("themes"), "system_admin", 2);
 
       foreach (theme_list(1) as $theme) {
         // NOTE: refresh the list because some themes might have been enabled/disabled.
@@ -65,15 +66,15 @@ function system_link($type) {
         }
       }
 
-      menu("admin/system/modules", t("modules"), "system_admin", system_help("admin/system/modules"), 3);
+      menu("admin/system/modules", t("modules"), "system_admin", 3);
       foreach (module_list(1) as $name) {
         // NOTE: refresh the list because some modules might have been enabled/disabled.
         if (module_hook($name, "settings")) {
-          menu("admin/system/modules/$name", t($name), "system_admin", module_invoke($name, "help", "admin/system/modules/$name") ? module_invoke($name, "help", "admin/system/modules/$name") : module_invoke($name, "system", "admin_help"));
+          menu("admin/system/modules/$name", t($name), "system_admin");
         }
       }
-      menu("admin/system/filters", t("filters"), "system_admin", system_help("admin/system/filters"), 4);
-      menu("admin/system/help", t("help"), "system_help", NULL, 9);
+      menu("admin/system/filters", t("filters"), "system_admin", 4);
+      menu("admin/system/help", t("help"), "system_help", 9);
     }
   }
 }
-- 
cgit v1.2.3