- Patch #80952 by earl, webchick, neclimdul et al: .info files

2 files changed, 7 insertions, 9 deletions

diff --git a/modules/system/system.info b/modules/system/system.info
new file mode 100644
index 000000000..134d72084
--- /dev/null
+++ b/modules/system/system.info
@@ -0,0 +1,4 @@
+; $Id$
+name = System
+description = Handles general site configuration for administrators.
+
diff --git a/modules/system/system.module b/modules/system/system.module
index 6c4c0a45a..6b7a630f4 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -30,8 +30,6 @@ function system_help($section) {
 ', array('@file-cron' => 'cron.php', '@external-http-drupal-org-cron' => 'http://drupal.org/cron', '@cron-status' => url('admin/settings/cron-status'), '@cron-manually' => url('admin/settings/cron-status/cron'), '@admin-settings' => url('admin/settings/page-caching')));
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@system">System page</a>.', array('@system' => 'http://drupal.org/handbook/modules/system/')) .'</p>';
       return $output;
-    case 'admin/settings/modules#description':
-      return t('Handles general site configuration for administrators.');
     case 'admin':
       return t('<p>Welcome to the administration section. Here you may control how your site functions.</p>');
     case 'admin/settings/page-caching':
@@ -1220,13 +1218,9 @@ function system_modules() {
   $files = module_rebuild_cache();
 
   foreach ($files as $filename => $file) {
-    drupal_get_filename('module', $file->name, $file->filename);
-    drupal_load('module', $file->name);
-
-    $file->description = module_invoke($file->name, 'help', 'admin/settings/modules#description');
-
-    $form['name'][$file->name] = array('#value' => $file->name);
-    $form['description'][$file->name] = array('#value' => $file->description);
+    $info = $file->info;
+    $form['name'][$file->name] = array('#value' => $info['name']);
+    $form['description'][$file->name] = array('#value' => t($info['description']));
     $options[$file->name] = '';
     if ($file->status) {
       $status[] = $file->name;