Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.229
diff -u -r1.229 system.install
--- modules/system/system.install	10 Jan 2008 22:47:17 -0000	1.229
+++ modules/system/system.install	13 Jan 2008 21:43:25 -0000
@@ -14,7 +14,7 @@
   // Ensure translations don't break at install time
   $t = get_t();
 
-  // Report Drupal version
+  // Report Drupal version.
   if ($phase == 'runtime') {
     $requirements['drupal'] = array(
       'title' => $t('Drupal'),
@@ -24,7 +24,7 @@
     );
   }
 
-  // Test web server
+  // Test web server.
   $software = $_SERVER['SERVER_SOFTWARE'];
   $requirements['webserver'] = array(
     'title' => $t('Web server'),
@@ -52,12 +52,8 @@
     $requirements['webserver']['description'] = $t('Unable to determine your web server type and version. Drupal might not work properly.');
     $requirements['webserver']['severity'] = REQUIREMENT_WARNING;
   }
-  if (ini_get('register_globals')) {
-    $requirements['php']['description'] = $t('<em>register_globals</em> is enabled. Drupal requires this configuration directive to be disabled. Your site may not be secure when <em>register_globals</em> is enabled. The PHP manual has instructions for <a href="http://php.net/configuration.changes">how to change configuration settings</a>.');
-    $requirements['php']['severity'] = REQUIREMENT_ERROR;
-  }
 
-  // Test PHP version
+  // Test PHP version.
   $requirements['php'] = array(
     'title' => $t('PHP'),
     'value' => ($phase == 'runtime') ? l(phpversion(), 'admin/reports/status/php') : phpversion(),
@@ -67,13 +63,27 @@
     $requirements['php']['severity'] = REQUIREMENT_ERROR;
   }
 
-  // Test PHP memory_limit
+  // Test PHP register_globals setting.
+  $register_globals = ini_get('register_globals');
+  $requirements['php_register_globals'] = array(
+    'title' => $t('PHP register globals'),
+  );
+  // A value of off may be an empty string, '0', or 'off'.
+  if (!empty($register_globals) && strtolower($register_globals) != 'off') {
+    $requirements['php_register_globals']['description'] = $t('<em>register_globals</em> is enabled. Drupal requires this configuration directive to be disabled. Your site may not be secure when <em>register_globals</em> is enabled. The PHP manual has instructions for <a href="http://php.net/configuration.changes">how to change configuration settings</a>.');
+    $requirements['php_register_globals']['severity'] = REQUIREMENT_ERROR;
+    $requirements['php_register_globals']['value'] = $t('Enabled');
+  }
+  else {
+    $requirements['php_register_globals']['value'] = $t('Disabled');
+  }
+
+  // Test PHP memory_limit.
   $memory_limit = ini_get('memory_limit');
   $requirements['php_memory_limit'] = array(
     'title' => $t('PHP memory limit'),
     'value' => $memory_limit,
   );
-
   if ($memory_limit && parse_size($memory_limit) < parse_size(DRUPAL_MINIMUM_PHP_MEMORY_LIMIT)) {
     $description = '';
     if ($phase == 'install') {
@@ -97,13 +107,13 @@
     }
   }
 
-  // Test DB version
+  // Test DB version.
   global $db_type;
   if (function_exists('db_status_report')) {
     $requirements += db_status_report($phase);
   }
 
-  // Test settings.php file writability
+  // Test that settings.php is read only.
   if ($phase == 'runtime') {
     $conf_dir = drupal_verify_install_file(conf_path(), FILE_NOT_WRITABLE, 'dir');
     $conf_file = drupal_verify_install_file(conf_path() .'/settings.php', FILE_EXIST|FILE_READABLE|FILE_NOT_WRITABLE);
@@ -183,7 +193,7 @@
     );
   }
 
-  // Test files directory
+  // Test files directory.
   $directory = file_directory_path();
 
   // For installer, create the directory if possible.