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

includes/module.inc

@@ -103,8 +103,13 @@ function module_rebuild_cache() {
   ksort($files);
 
   foreach ($files as $filename => $file) {
-    drupal_get_filename('module', $file->name, $file->filename);
-    drupal_load('module', $file->name);
+    $file->info = _module_parse_info_file(dirname($file->filename) .'/'. $file->name .'.info');
+    // Skip modules that don't provide info.
+    if (empty($file->info)) {
+      unset($files[$filename]);
+      continue;
+    }
+    $files[$filename]->info = $file->info;
 
     // log the critical hooks implemented by this module
     $bootstrap = 0;
@@ -116,12 +121,13 @@ function module_rebuild_cache() {
     }
 
     // Update the contents of the system table:
+    // TODO: We shouldn't actually need this description field anymore. Remove me next release.
     if (isset($file->status) || (isset($file->old_filename) && $file->old_filename != $file->filename)) {
-      db_query("UPDATE {system} SET description = '%s', name = '%s', filename = '%s', bootstrap = %d WHERE filename = '%s'", $file->description, $file->name, $file->filename, $bootstrap, $file->old_filename);
+      db_query("UPDATE {system} SET description = '%s', name = '%s', filename = '%s', bootstrap = %d WHERE filename = '%s'", $file->info['description'], $file->name, $file->filename, $bootstrap, $file->old_filename);
     }
     else {
       // This is a new module.
-      db_query("INSERT INTO {system} (name, description, type, filename, status, throttle, bootstrap) VALUES ('%s', '%s', '%s', '%s', %d, %d, %d)", $file->name, $file->description, 'module', $file->filename, $file->status, $file->throttle, $bootstrap);
+      db_query("INSERT INTO {system} (name, description, type, filename, status, throttle, bootstrap) VALUES ('%s', '%s', '%s', '%s', %d, %d, %d)", $file->name, $file->info['description'], 'module', $file->filename, $file->status, $file->throttle, $bootstrap);
     }
   }
 
@@ -152,6 +158,34 @@ function module_parse_meta_file($filename) {
   return $metadata;
 }
 
+/**
+ * Parse Drupal info file format.
+ * Uses ini parser provided by php's parse_ini_file().
+ *
+ * Files should use the ini format to specify values.
+ * e.g.
+ * key = "value"
+ * key2 = value2
+ *
+ * Some things to be aware of:
+ * - This function is NOT for placing arbitrary module-specific settings. Use variable_get()
+ *   and variable_set() for that.
+ * - You may not use double-quotes in a value.
+ *
+ * @param $filename
+ *   The file we are parsing.  Accepts file with relative or absolute path.
+ * @return
+ *   The info array.
+ */
+function _module_parse_info_file($filename) {
+  $info = array();
+
+  if (file_exists($filename)) {
+    $info = parse_ini_file($filename);
+  }
+  return $info;
+}
+
 /**
  * Determine whether a given module exists.
  *

modules/aggregator/aggregator.info

+; $Id$
+name = Aggregator
+description = "Aggregates syndicated content (RSS, RDF, and Atom feeds)."

modules/aggregator/aggregator.module

@@ -27,8 +27,6 @@ function aggregator_help($section) {
 ', array('@admin-aggregator' => url('admin/content/aggregator'), '@admin-aggregator-add-feed' => url('admin/content/aggregator/add/feed'), '@admin-aggregator-add-category' => url('admin/content/aggregator/add/category'), '@admin-settings-aggregator' => url('admin/settings/aggregator'), '@admin-access' => url('admin/user/access'), '@aggregator' => url('aggregator')));
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@aggregator">Aggregator page</a>.', array('@aggregator' => 'http://drupal.org/handbook/modules/aggregator/')) .'</p>';
       return $output;
-    case 'admin/settings/modules#description':
-      return t('Aggregates syndicated content (RSS, RDF, and Atom feeds).');
     case 'admin/content/aggregator':
       return t('<p>Thousands of sites (particularly news sites and weblogs) publish their latest headlines and/or stories in a machine-readable format so that other sites can easily link to them. This content is usually in the form of an <a href="http://blogs.law.harvard.edu/tech/rss">RSS</a> feed (which is an XML-based syndication standard). To display the feed or category in a block you must decide how many items to show by editing the feed or block and turning on the <a href="@block">feed\'s block</a>.</p>', array('@block' => url('admin/build/block')));
     case 'admin/content/aggregator/add/feed':

modules/block/block.info

+; $Id$
+name = Block
+description = Controls the boxes that are displayed around the main content.
+

modules/block/block.module

@@ -38,8 +38,6 @@ function block_help($section) {
 ', array('@admin-block' => url('admin/build/block'), '@admin-block-add' => url('admin/build/block/add')));
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@block">Block page</a>.', array('@block' => 'http://drupal.org/handbook/modules/block/')) .'</p>';
       return $output;
-    case 'admin/settings/modules#description':
-      return t('Controls the boxes that are displayed around the main content.');
     case 'admin/build/block':
       return t("
 <p>Blocks are boxes of content that may be rendered into certain regions of your web pages, for example, into sidebars. They are usually generated automatically by modules, but administrators can create blocks manually.</p>

modules/blog/blog.info

+; $Id$
+name = Blog
+description = Enables keeping an easily and regularly updated web page or a blog.
+

modules/blog/blog.module

@@ -76,8 +76,6 @@ function blog_help($section) {
 ', array('@user' => url('user'), '@node-add-blog' => url('node/add/blog'), '@admin-node-configure-types-blog' => url('admin/content/types/blog'), '@admin-settings-blogapi' => url('admin/settings/blogapi'), '@admin-block' => url('admin/build/block')));
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@blog">Blog page</a>.', array('@blog' => 'http://drupal.org/handbook/modules/blog/')) .'</p>';
       return $output;
-    case 'admin/settings/modules#description':
-      return t('Enables keeping an easily and regularly updated web page or a blog.');
   }
 }
 

modules/blogapi/blogapi.info

+; $Id$
+name = Blog API
+description = Allows users to post content using applications that support XML-RPC blog APIs.
+

modules/blogapi/blogapi.module

@@ -23,8 +23,6 @@ function blogapi_help($section) {
 ', array('@file-xmlrpc' => 'xmlrpc.php', '@admin-settings-blogapi' => url('admin/settings/blogapi')));
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@blogapi">BlogApi page</a>.', array('@blogapi' => 'http://drupal.org/handbook/modules/blogapi/')) .'</p>';
       return $output;
-    case 'admin/settings/modules#description':
-      return t('Allows users to post content using applications that support XML-RPC blog APIs.');
   }
 }
 

modules/book/book.info

+; $Id$
+name = Book
+description = Allows users to collaboratively author a book.
+

modules/book/book.module

@@ -985,8 +985,6 @@ function book_help($section) {
 ', array('@node-add-book' => url('node/add/book'), '@admin-node-book' => url('admin/content/book'), '@admin-settings-content-types-book-page' => url('admin/content/types/book'), '@admin-block' => url('admin/build/block'), '@admin-access' => url('admin/user/access')));
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@book">Book page</a>.', array('@book' => 'http://drupal.org/handbook/modules/book/')) .'</p>';
       return $output;
-    case 'admin/settings/modules#description':
-      return t('Allows users to collaboratively author a book.');
     case 'admin/content/book':
       return t('<p>The book module offers a means to organize content, authored by many users, in an online manual, outline or FAQ.</p>');
     case 'admin/content/book/orphan':

modules/comment/comment.info

+; $Id$
+name = Comment
+description = Allows users to comment on and discuss published content.
+

modules/comment/comment.module

@@ -80,8 +80,6 @@ function comment_help($section) {
 ', array('@admin-access' => url('admin/user/access'), '@admin-settings-comment' => url('admin/content/comment/settings')));
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@comment">Comment page</a>.', array('@comment' => 'http://drupal.org/handbook/modules/comment/')) .'</p>';
       return $output;
-    case 'admin/settings/modules#description':
-      return t('Allows users to comment on and discuss published content.');
     case 'admin/content/comment':
     case 'admin/content/comment/new':
       return t("<p>Below is a list of the latest comments posted to your site. Click on a subject to see the comment, the author's name to edit the author's user information , \"edit\" to modify the text, and \"delete\" to remove their submission.</p>");

modules/contact/contact.info

+; $Id$
+name = Contact
+description = Enables the use of both personal and site-wide contact forms.
+

modules/contact/contact.module

@@ -23,8 +23,6 @@ function contact_help($section) {
       $output .= '<li>'. t('Site-wide contact form <a href="@menu-configuration">menu configuration</a>.', array('@menu-configuration' => url('admin/build/menu'))) .'</li></ul>';
       $output .= t('For more information, please read the configuration and customization handbook page for the <a href="@contact">contact module</a>.', array('@contact' => url('http://drupal.org/handbook/modules/contact/', NULL, NULL, TRUE)));
       return $output;
-    case 'admin/settings/modules#description':
-      return t('Enables the use of both personal and site-wide contact forms.');
     case 'admin/build/contact':
       $output = t('This page lets you setup <a href="@form">your site-wide contact form</a>. To do so, add one or more categories. You can associate different recipients with each category to route e-mails to different people. For example, you can route website feedback to the webmaster and direct product information requests to the sales department. On the <a href="@settings">settings page</a>, you can customize the information shown above the contact form. This can be useful to provide additional contact information such as your postal address and telephone number.', array('@settings' => url('admin/build/contact/settings'), '@form' => url('contact')));
       if (!module_exists('menu')) {

modules/drupal/drupal.info

+; $Id$
+name = Drupal
+description = Lets you register your site with a central server and improve ranking of Drupal projects by posting information on your installed modules and themes; also enables users to log in using a Drupal ID.
+

modules/drupal/drupal.module

@@ -44,8 +44,6 @@ function drupal_help($section) {
 
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@drupal">Drupal page</a>.', array('@drupal' => 'http://drupal.org/handbook/modules/drupal/')) .'</p>';
       return $output;
-    case 'admin/settings/modules#description':
-      return t('Lets you register your site with a central server and improve ranking of Drupal projects by posting information on your installed modules and themes; also enables users to log in using a Drupal ID.');
     case 'admin/settings/distributed-authentication':
       return t('<p>Using this your site can "call home" to another Drupal server. By calling home to drupal.org and sending a list of your installed modules and themes, you help rank projects on drupal.org and so assist all Drupal administrators to find the best components for meeting their needs. If you want to register with a different server, you can change the Drupal XML-RPC server setting -- but the server has to be able to handle Drupal XML. Some XML-RPC servers may present directories of all registered sites. To get all your site information listed, go to the <a href="@site-settings">site information settings page</a> and set the site name, the e-mail address, the slogan, and the mission statement.</p>', array('@site-settings' => url('admin/settings/site-information')));
     case 'user/help#drupal':

modules/filter/filter.info

+; $Id$
+name = Filter
+description = Handles the filtering of content in preparation for display.
+

modules/filter/filter.module

@@ -30,8 +30,6 @@ function filter_help($section) {
 ', array('@admin-filters' => url('admin/settings/filters')));
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@filter">Filter page</a>.', array('@filter' => 'http://drupal.org/handbook/modules/filter/')) .'</p>';
       return $output;
-    case 'admin/settings/modules#description':
-      return t('Handles the filtering of content in preparation for display.');
 
     case 'admin/settings/filters':
       return t('

modules/forum/forum.info

+; $Id$
+name = Forum
+description = Enables threaded discussions about general topics.
+