? install-check-312144.patch
? sites/default/files
? sites/default/private
? sites/default/settings.php
Index: includes/install.core.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/install.core.inc,v
retrieving revision 1.7
diff -u -p -r1.7 install.core.inc
--- includes/install.core.inc	31 Mar 2010 19:10:39 -0000	1.7
+++ includes/install.core.inc	3 Apr 2010 14:31:13 -0000
@@ -1532,8 +1532,10 @@ function install_check_requirements($ins
     $writable = FALSE;
     $conf_path = './' . conf_path(FALSE, TRUE);
     $settings_file = $conf_path . '/settings.php';
+    $default_settings_file = $conf_path . '/default.settings.php';
     $file = $conf_path;
     $exists = FALSE;
+    $default_exists = FALSE;
     // Verify that the directory exists.
     if (drupal_verify_install_file($conf_path, FILE_EXIST, 'dir')) {
       // Check to make sure a settings.php already exists.
@@ -1544,8 +1546,11 @@ function install_check_requirements($ins
         $writable = drupal_verify_install_file($settings_file, FILE_READABLE|FILE_WRITABLE);
         $exists = TRUE;
       }
+      // Check to make sure the default.settings.php exists.
+      $default_exists = drupal_verify_install_file($default_settings_file, FILE_EXIST|FILE_READABLE);
     }
-
+    
+    // If settings.php does not exist, throw error.
     if (!$exists) {
       $requirements['settings file exists'] = array(
         'title'       => st('Settings file'),
@@ -1559,7 +1564,9 @@ function install_check_requirements($ins
         'title'       => st('Settings file'),
         'value'       => st('The %file file exists.', array('%file' => $file)),
       );
-      if (!$writable) {
+      
+    // If settings.php is not writable, throw error.
+    if (!$writable) {
         $requirements['settings file writable'] = array(
           'title'       => st('Settings file'),
           'value'       => st('The settings file is not writable.'),
@@ -1573,6 +1580,16 @@ function install_check_requirements($ins
           'value'       => st('Settings file is writable.'),
         );
       }
+      
+      // If default.settings.php does not exist, or is not readable, throw error.
+      if (!$default_exists) {
+        $requirements['default settings file exists'] = array(
+          'title'       => st('Default Settings file'),
+          'value'       => st('The file %default-file does not exist.', array('%default-file' => $default_settings_file)),
+          'severity'    => REQUIREMENT_ERROR,
+          'description' => st('Please ensure that %default-file exists and is not modified in any way from the original download.', array('%default-file' => $default_settings_file)),
+        );
+      }
     }
   }
   return $requirements;