Index: install.php
===================================================================
RCS file: /cvs/drupal/drupal/install.php,v
retrieving revision 1.133
diff -u -p -r1.133 install.php
--- install.php	20 Sep 2008 20:22:23 -0000	1.133
+++ install.php	28 Sep 2008 11:35:06 -0000
@@ -895,9 +895,11 @@ function install_check_requirements($pro
   if (!$verify) {
     $writable = FALSE;
     $conf_path = './' . conf_path(FALSE, TRUE);
+    $default_settings_file = $conf_path . '/default.settings.php';
     $settings_file = $conf_path . '/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.
@@ -906,20 +908,25 @@ 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;
       }
     }
+    if (drupal_verify_install_file($default_settings_file,FILE_EXIST|FILE_READABLE)) {
+      $default_exists = TRUE;
+    }
     if (!$exists) {
       drupal_set_message(st('The @drupal installer requires that you create a settings file as part of the installation process.
 <ol>
 <li>Copy the %default_file file to %file.</li>
 <li>Change file permissions so that it is writable by the web server. If you are unsure how to grant file permissions, please consult the <a href="@handbook_url">on-line handbook</a>.</li>
 </ol>
-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', '@handbook_url' => 'http://drupal.org/server-permissions')), 'error');
+More details about installing Drupal are available in INSTALL.txt.', array('@drupal' => drupal_install_profile_name(), '%file' => $file, '%default_file' => $default_settings_file, '@handbook_url' => 'http://drupal.org/server-permissions')), 'error');
     }
     elseif (!$writable) {
       drupal_set_message(st('The @drupal installer requires write permissions to %file during the installation process. If you are unsure how to grant file permissions, please consult the <a href="@handbook_url">online handbook</a>.', array('@drupal' => drupal_install_profile_name(), '%file' => $file, '@handbook_url' => 'http://drupal.org/server-permissions')), 'error');
     }
+    if (!$default_exists) {
+      drupal_set_message(st('Please make sure that %default-file exists.', array('%default-file' => $default_settings_file)), 'error');
+    }
   }
 
   // Check the other requirements.