- Patch #87298 by webchick, neil, dww et al: show version numbers on modules page.

31 files changed, 33 insertions, 2 deletions

diff --git a/modules/aggregator/aggregator.info b/modules/aggregator/aggregator.info
index 3965acac5..84c7c0afd 100644
--- a/modules/aggregator/aggregator.info
+++ b/modules/aggregator/aggregator.info
@@ -2,3 +2,4 @@
 name = Aggregator
 description = "Aggregates syndicated content (RSS, RDF, and Atom feeds)."
 package = Core - optional
+version = VERSION
diff --git a/modules/block/block.info b/modules/block/block.info
index d5c4d57c0..8c12ddec7 100644
--- a/modules/block/block.info
+++ b/modules/block/block.info
@@ -2,3 +2,4 @@
 name = Block
 description = Controls the boxes that are displayed around the main content.
 package = Core - required
+version = VERSION
diff --git a/modules/blog/blog.info b/modules/blog/blog.info
index 03bb889b2..9c9410d8a 100644
--- a/modules/blog/blog.info
+++ b/modules/blog/blog.info
@@ -2,3 +2,4 @@
 name = Blog
 description = Enables keeping an easily and regularly updated web page or a blog.
 package = Core - optional
+version = VERSION
diff --git a/modules/blogapi/blogapi.info b/modules/blogapi/blogapi.info
index 5efd7ce1e..ceab75326 100644
--- a/modules/blogapi/blogapi.info
+++ b/modules/blogapi/blogapi.info
@@ -2,3 +2,4 @@
 name = Blog API
 description = Allows users to post content using applications that support XML-RPC blog APIs.
 package = Core - optional
+version = VERSION
diff --git a/modules/book/book.info b/modules/book/book.info
index 16ce9d27f..e9f69bdfb 100644
--- a/modules/book/book.info
+++ b/modules/book/book.info
@@ -2,3 +2,4 @@
 name = Book
 description = Allows users to collaboratively author a book.
 package = Core - optional
+version = VERSION
diff --git a/modules/color/color.info b/modules/color/color.info
index 642eae038..9c66ccdc3 100644
--- a/modules/color/color.info
+++ b/modules/color/color.info
@@ -2,3 +2,4 @@
 name = Color
 description = Allows the user to change the color scheme of certain themes.
 package = Core - optional
+version = VERSION
diff --git a/modules/comment/comment.info b/modules/comment/comment.info
index 376a438bb..0fe9f1dd5 100644
--- a/modules/comment/comment.info
+++ b/modules/comment/comment.info
@@ -2,3 +2,4 @@
 name = Comment
 description = Allows users to comment on and discuss published content.
 package = Core - optional
+version = VERSION
diff --git a/modules/contact/contact.info b/modules/contact/contact.info
index 7959e72ab..238275eaf 100644
--- a/modules/contact/contact.info
+++ b/modules/contact/contact.info
@@ -2,3 +2,4 @@
 name = Contact
 description = Enables the use of both personal and site-wide contact forms.
 package = Core - optional
+version = VERSION
diff --git a/modules/drupal/drupal.info b/modules/drupal/drupal.info
index 1e1eb161c..ce23d5c27 100644
--- a/modules/drupal/drupal.info
+++ b/modules/drupal/drupal.info
@@ -2,3 +2,4 @@
 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.
 package = Core - optional
+version = VERSION
diff --git a/modules/filter/filter.info b/modules/filter/filter.info
index 75b3ffadb..058a40b9a 100644
--- a/modules/filter/filter.info
+++ b/modules/filter/filter.info
@@ -2,3 +2,4 @@
 name = Filter
 description = Handles the filtering of content in preparation for display.
 package = Core - required
+version = VERSION
diff --git a/modules/forum/forum.info b/modules/forum/forum.info
index e025239a7..4a726bfc1 100644
--- a/modules/forum/forum.info
+++ b/modules/forum/forum.info
@@ -3,3 +3,4 @@ name = Forum
 description = Enables threaded discussions about general topics.
 dependencies = taxonomy comment
 package = Core - optional
+version = VERSION
diff --git a/modules/help/help.info b/modules/help/help.info
index 58d7b2dc8..da857ef96 100644
--- a/modules/help/help.info
+++ b/modules/help/help.info
@@ -2,3 +2,4 @@
 name = Help
 description = Manages the display of online help.
 package = Core - optional
+version = VERSION
diff --git a/modules/legacy/legacy.info b/modules/legacy/legacy.info
index c709b5700..60f2a857f 100644
--- a/modules/legacy/legacy.info
+++ b/modules/legacy/legacy.info
@@ -2,3 +2,4 @@
 name = Legacy
 description = Provides legacy handlers for upgrades from older Drupal installations.
 package = Core - optional
+version = VERSION
diff --git a/modules/locale/locale.info b/modules/locale/locale.info
index cbde69fb2..10f58da6f 100644
--- a/modules/locale/locale.info
+++ b/modules/locale/locale.info
@@ -2,3 +2,4 @@
 name = Locale
 description = Enables the translation of the user interface to languages other than English.
 package = Core - optional
+version = VERSION
diff --git a/modules/menu/menu.info b/modules/menu/menu.info
index 8987309cc..724b48445 100644
--- a/modules/menu/menu.info
+++ b/modules/menu/menu.info
@@ -2,3 +2,4 @@
 name = Menu
 description = Allows administrators to customize the site navigation menu.
 package = Core - optional
+version = VERSION
diff --git a/modules/node/node.info b/modules/node/node.info
index c434a05ca..7bbc00b32 100644
--- a/modules/node/node.info
+++ b/modules/node/node.info
@@ -2,4 +2,4 @@
 name = Node
 description = Allows content to be submitted to the site and displayed on pages.
 package = Core - required
-
+version = VERSION
diff --git a/modules/path/path.info b/modules/path/path.info
index dc6c2ff57..71501d850 100644
--- a/modules/path/path.info
+++ b/modules/path/path.info
@@ -2,3 +2,4 @@
 name = Path
 description = Allows users to rename URLs.
 package = Core - optional
+version = VERSION
diff --git a/modules/ping/ping.info b/modules/ping/ping.info
index 8bc2a4ea5..cf72abb0a 100644
--- a/modules/ping/ping.info
+++ b/modules/ping/ping.info
@@ -2,3 +2,4 @@
 name = Ping
 description = Alerts other sites when your site has been updated.
 package = Core - optional
+version = VERSION
diff --git a/modules/poll/poll.info b/modules/poll/poll.info
index bc348482d..45d9c16f0 100644
--- a/modules/poll/poll.info
+++ b/modules/poll/poll.info
@@ -2,3 +2,4 @@
 name = Poll
 description = Allows your site to capture votes on different topics in the form of multiple choice questions.
 package = Core - optional
+version = VERSION
diff --git a/modules/profile/profile.info b/modules/profile/profile.info
index b94680028..042adc47b 100644
--- a/modules/profile/profile.info
+++ b/modules/profile/profile.info
@@ -2,3 +2,4 @@
 name = Profile
 description = Supports configurable user profiles.
 package = Core - optional
+version = VERSION
diff --git a/modules/search/search.info b/modules/search/search.info
index ca804c326..4ebabd18d 100644
--- a/modules/search/search.info
+++ b/modules/search/search.info
@@ -2,3 +2,4 @@
 name = Search
 description = Enables site-wide keyword searching.
 package = Core - optional
+version = VERSION
diff --git a/modules/statistics/statistics.info b/modules/statistics/statistics.info
index 404b48329..43ca8f710 100644
--- a/modules/statistics/statistics.info
+++ b/modules/statistics/statistics.info
@@ -2,3 +2,4 @@
 name = Statistics
 description = Logs access statistics for your site.
 package = Core - optional
+version = VERSION
diff --git a/modules/system/system.info b/modules/system/system.info
index 6d78715ad..a894f9bc3 100644
--- a/modules/system/system.info
+++ b/modules/system/system.info
@@ -2,3 +2,4 @@
 name = System
 description = Handles general site configuration for administrators.
 package = Core - required
+version = VERSION
diff --git a/modules/system/system.module b/modules/system/system.module
index 7bd9dd41c..e3b4cbdb6 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1230,6 +1230,7 @@ function system_modules($form_values = NULL) {
   // Traverse the files retrieved and build the form.
   foreach ($files as $filename => $file) {
     $form['name'][$filename] = array('#value' => $file->info['name']);
+    $form['version'][$filename] = array('#value' => $file->info['version']);
     $form['description'][$filename] = array('#value' => t($file->info['description']));
     $options[$filename] = '';
     if ($file->status) {
@@ -1497,6 +1498,7 @@ function theme_system_modules($form) {
     $header[] = t('Throttle');
   }
   $header[] = t('Name');
+  $header[] = t('Version');
   $header[] = t('Description');
 
   // Pull package information from module list and start grouping modules.
@@ -1521,6 +1523,7 @@ function theme_system_modules($form) {
         $row[] = array('data' => drupal_render($form['throttle'][$key]), 'align' => 'center');
       }
       $row[] = '<strong>'. drupal_render($form['name'][$key]) .'</strong>';
+      $row[] = drupal_render($form['version'][$key]);
       $row[] = array('data' => drupal_render($form['description'][$key]), 'class' => 'description');
       $rows[] = $row;
     }
diff --git a/modules/taxonomy/taxonomy.info b/modules/taxonomy/taxonomy.info
index d124efb40..aa9e52ea1 100644
--- a/modules/taxonomy/taxonomy.info
+++ b/modules/taxonomy/taxonomy.info
@@ -2,3 +2,4 @@
 name = Taxonomy
 description = Enables the categorization of content.
 package = Core - optional
+version = VERSION
diff --git a/modules/throttle/throttle.info b/modules/throttle/throttle.info
index e3ada5262..6b65ce577 100644
--- a/modules/throttle/throttle.info
+++ b/modules/throttle/throttle.info
@@ -2,3 +2,4 @@
 name = Throttle
 description = Handles the auto-throttling mechanism, to control site congestion.
 package = Core - optional
+version = VERSION
diff --git a/modules/tracker/tracker.info b/modules/tracker/tracker.info
index 00f8d938b..0dceed5b9 100644
--- a/modules/tracker/tracker.info
+++ b/modules/tracker/tracker.info
@@ -2,3 +2,4 @@
 name = Tracker
 description = Enables tracking of recent posts for users.
 package = Core - optional
+version = VERSION
diff --git a/modules/upload/upload.info b/modules/upload/upload.info
index 880081998..a0d2c4068 100644
--- a/modules/upload/upload.info
+++ b/modules/upload/upload.info
@@ -2,3 +2,4 @@
 name = Upload
 description = Allows users to upload and attach files to content.
 package = Core - optional
+version = VERSION
diff --git a/modules/user/user.info b/modules/user/user.info
index 913deb849..be836c41e 100644
--- a/modules/user/user.info
+++ b/modules/user/user.info
@@ -2,3 +2,4 @@
 name = User
 description = Manages the user registration and login system.
 package = Core - required
+version = VERSION
diff --git a/modules/watchdog/watchdog.info b/modules/watchdog/watchdog.info
index c256c531d..784e36ebf 100644
--- a/modules/watchdog/watchdog.info
+++ b/modules/watchdog/watchdog.info
@@ -2,3 +2,4 @@
 name = Watchdog
 description = Logs and records system events.
 package = Core - required
+version = VERSION
diff --git a/sites/default/settings.php b/sites/default/settings.php
index 854bbec9a..bef5a8759 100644
--- a/sites/default/settings.php
+++ b/sites/default/settings.php
@@ -84,7 +84,7 @@
  *   $db_url = 'mysqli://username:password@localhost/databasename';
  *   $db_url = 'pgsql://username:password@localhost/databasename';
  */
-$db_url = 'mysql://username:password@localhost/databasename';
+$db_url = 'mysql://drupal:drupal@localhost/drupal';
 $db_prefix = '';
 
 /**