Patch #312144 by Damien Tournoud: allow the installation to complete without a default.settings.php.

From: damz <damz@damz-dev.local>


---
 install.inc |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git includes/install.inc includes/install.inc
index b79217e..f8578f3 100644
--- includes/install.inc
+++ includes/install.inc
@@ -334,7 +334,6 @@ abstract class DatabaseInstaller {
  *   An array of settings that need to be updated.
  */
 function drupal_rewrite_settings($settings = array(), $prefix = '') {
-  $default_settings = 'sites/default/default.settings.php';
   drupal_static_reset('conf_path');
   $settings_file = conf_path(FALSE) . '/' . $prefix . 'settings.php';
 
@@ -347,7 +346,7 @@ function drupal_rewrite_settings($settings = array(), $prefix = '') {
 
   $buffer = NULL;
   $first = TRUE;
-  if ($fp = fopen(DRUPAL_ROOT . '/' . $default_settings, 'r')) {
+  if ($fp = fopen(DRUPAL_ROOT . '/' . $settings_file, 'r')) {
     // Step line by line through settings.php.
     while (!feof($fp)) {
       $line = fgets($fp);
@@ -401,7 +400,7 @@ function drupal_rewrite_settings($settings = array(), $prefix = '') {
     }
   }
   else {
-    drupal_set_message(st('Failed to open %settings, please verify the file permissions.', array('%settings' => $default_settings)), 'error');
+    drupal_set_message(st('Failed to open %settings, please verify the file permissions.', array('%settings' => $settings_file)), 'error');
   }
 }