--- install.php	Fri Oct 03 08:22:08 2008
+++ install.php	Fri Oct 03 09:56:23 2008
@@ -902,2 +902,3 @@
-    $writable = FALSE;
-    $conf_path = './' . conf_path(FALSE, TRUE);
+    $writable = $exists = $default_exists = FALSE;
+    
+    $conf_path = DRUPAL_ROOT . '/' .conf_path(FALSE, TRUE);
@@ -904,0 +906,2 @@
+    $default_settings_file = $conf_path . '/default.settings.php';
+    
@@ -906 +908,0 @@
-    $exists = FALSE;
@@ -915 +916,0 @@
-        $exists = TRUE;
@@ -916,0 +918,2 @@
+      // Check to make sure the default.settings.php exists.
+      $default_exists = drupal_verify_install_file($default_settings_file, FILE_EXIST|FILE_READABLE);
@@ -924 +927 @@
-        'description' => st('The @drupal installer requires that you create a settings file as part of the installation process. Copy the %default_file file to %file. More details about installing Drupal are available in INSTALL.txt.', array('@drupal' => drupal_install_profile_name(), '%file' => $file, '%default_file' => $conf_path .'/default.settings.php')),
+        'description' => st('The @drupal installer requires that you create a settings file as part of the installation process. Copy the %default_file file to %file. More details about installing Drupal are available in INSTALL.txt.', array('@drupal' => drupal_install_profile_name(), '%file' => $file, '%default_file' => $default_settings_file)),
@@ -943 +946 @@
-        'title'       => st('Settings file'), 
+        'title'       => st('Settings file'),
@@ -944,0 +948,8 @@
+      );
+    }
+    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)),