? 145335_25_2.patch
? 145335_25_3.patch
Index: install.php
===================================================================
RCS file: /cvs/drupal/drupal/install.php,v
retrieving revision 1.85
diff -u -p -r1.85 install.php
--- install.php	31 Oct 2007 16:14:15 -0000	1.85
+++ install.php	4 Nov 2007 07:16:04 -0000
@@ -180,7 +180,6 @@ function install_change_settings($profil
   // We always need this because we want to run form_get_errors.
   include_once './includes/form.inc';
   drupal_maintenance_theme();
-  install_task_list('database');
 
   // The existing database settings are not working, so we need write access
   // to settings.php to change them.
@@ -201,10 +200,11 @@ function install_change_settings($profil
   }
 
   if (!$writable) {
-    drupal_set_message(st('The @drupal installer requires write permissions to %file during the installation process.', array('@drupal' => drupal_install_profile_name(), '%file' => $file)), 'error');
-
-    drupal_set_title(st('Drupal database setup'));
-    print theme('install_page', '');
+    drupal_set_message(st("The @drupal installer requires special permissions to %file during the installation process. In order to continue, you'll need to change permissions of %file to 'read' 'write' and 'execute' for 'owner', 'group' and 'other'. This can be done via a control panel on shared hosting or by typing 'chmod 777 %file' (without quotation marks) in the shell command line.", array('@drupal' => drupal_install_profile_name(), '%file' => $file)), 'error');
+    $output = '<a href="install.php?profile='. $profile .'&amp;locale='. $install_locale .'">'. st('Continue installation') .'</a>';
+    drupal_set_title(st('Drupal settings file requirements'));
+    install_task_list('requirements');
+    print theme('install_page', $output);
     exit;
   }
 
@@ -218,6 +218,7 @@ function install_change_settings($profil
 
   $output = drupal_get_form('install_settings_form', $profile, $install_locale, $settings_file, $db_url, $db_type, $db_prefix, $db_user, $db_pass, $db_host, $db_port, $db_path);
   drupal_set_title(st('Database configuration'));
+  install_task_list('database');
   print theme('install_page', $output);
   exit;
 }