Index: modules/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system.module,v
retrieving revision 1.330
diff -u -r1.330 system.module
--- modules/system.module	5 Jul 2006 11:45:51 -0000	1.330
+++ modules/system.module	5 Jul 2006 12:17:05 -0000
@@ -32,7 +32,7 @@
       return t('Handles general site configuration for administrators.');
     case 'admin':
       return t('<p>Welcome to the administration section. Below are the most recent system events.</p>');
-    case 'admin/settings':
+    case 'admin/settings/system':
       return t('<p>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.</p>');
     case 'admin/themes':
       return t('<p>Select which themes are available to your users and specify the default theme. To configure site-wide display settings, click the "configure" task above. Alternately, to override these settings in a specific theme, click the "configure" link for the corresponding theme. Note that different themes may have different regions available for rendering content like blocks. If you want consistency in what your users see, you may wish to enable only one theme.</p>');
@@ -245,7 +245,7 @@
   return $zones;
 }
 
-function system_view_general() {
+function system_settings() {
   // General settings:
   $form['general'] = array(
     '#type' => 'fieldset', '#title' => t('General settings'),
@@ -493,7 +493,7 @@
 
 /**
  * Checks the existence of the directory specified in $form_element. This
- * function is called from the system_view_general form to check both the
+ * function is called from the system_settings form to check both the
  * file_directory_path and file_directory_temp directories. If validation
  * fails, the form element is flagged with an error from within the
  * file_check_directory function.
@@ -1033,13 +1033,19 @@
 
   if ($module) {
     $form = module_invoke($module, 'settings');
+    return system_settings_form($module . '_settings_form', $form);
   }
   else {
-    $form = system_view_general();
-    $module = 'system';
+    
+    $output = '<ul>';
+    
+    $menu = menu_get_item(NULL, 'admin/settings');
+    foreach ($menu['children'] as $mid) {
+      $output .= ' <li>'. menu_item_link($mid) .'</li>';
+    }
+    $output .= '</ul>';
+    return $output;
   }
-
-  return system_settings_form($module . '_settings_form', $form);
 }
 
 /**