Index: install.php
===================================================================
RCS file: /cvs/drupal/drupal/install.php,v
retrieving revision 1.134
diff -u -p -r1.134 install.php
--- install.php	1 Oct 2008 00:27:29 -0000	1.134
+++ install.php	2 Oct 2008 20:18:21 -0000
@@ -902,8 +902,10 @@ function install_check_requirements($pro
     $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.
@@ -912,8 +914,8 @@ function install_check_requirements($pro
         $exists = TRUE;
         // If it does, make sure it is writable.
         $writable = drupal_verify_install_file($settings_file, FILE_READABLE|FILE_WRITABLE);
-        $exists = TRUE;
       }
+      $default_exists = drupal_verify_install_file($default_settings_file, FILE_EXIST|FILE_READABLE);
     }
 
     if (!$exists) {
@@ -921,7 +923,7 @@ function install_check_requirements($pro
         'title'       => st('Settings file'),
         'value'       => st('The settings file does not exist.'),
         'severity'    => REQUIREMENT_ERROR,
-        '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)),
       );
     }
     elseif ($exists) {
@@ -940,10 +942,18 @@ function install_check_requirements($pro
     }
     elseif ($writable) {
       $requirements['settings file'] = array(
-        'title'       => st('Settings file'), 
+        'title'       => st('Settings file'),
         'value'       => st('Settings file is writable.'),
       );
     }
+    if (!$default_exists) {
+      $requirements['default settings file exists'] = array(
+        'title'       => st('Default Settings file'),
+        'value'       => st('The file default.settings.php does not exist.'),
+        '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;
 }