Index: includes/theme.maintenance.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.maintenance.inc,v retrieving revision 1.15 diff -u -r1.15 theme.maintenance.inc --- includes/theme.maintenance.inc 1 Jul 2008 20:36:40 -0000 1.15 +++ includes/theme.maintenance.inc 12 Jul 2008 19:49:20 -0000 @@ -66,6 +66,7 @@ drupal_add_css(drupal_get_path('module', 'system') . '/system.css', 'module'); drupal_add_css(drupal_get_path('module', 'system') . '/system-menus.css', 'module'); drupal_add_css(drupal_get_path('module', 'system') . '/maintenance.css', 'module'); + drupal_add_css(drupal_get_path('module', 'system') . '/admin.css', 'module'); } /** Index: install.php =================================================================== RCS file: /cvs/drupal/drupal/install.php,v retrieving revision 1.122 diff -u -r1.122 install.php --- install.php 3 Jul 2008 17:57:03 -0000 1.122 +++ install.php 12 Jul 2008 19:49:20 -0000 @@ -115,14 +115,6 @@ // Verify existence of all required modules. $modules = drupal_verify_profile($profile, $install_locale); - // If any error messages are set now, it means a requirement problem. - $messages = drupal_set_message(); - if (!empty($messages['error'])) { - install_task_list('requirements'); - drupal_set_title(st('Requirements problem')); - print theme('install_page', ''); - exit; - } // Change the settings.php information if verification failed earlier. // Note: will trigger a redirect if database credentials change. @@ -873,7 +865,9 @@ * Check installation requirements and report any errors. */ function install_check_requirements($profile, $verify) { - + // Check the requirements. + $requirements = drupal_check_profile($profile); + // If Drupal is not set up already, we need to create a settings file. if (!$verify) { $writable = FALSE; @@ -894,39 +888,31 @@ } } - if (!$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 online handbook.', array('@drupal' => drupal_install_profile_name(), '%file' => $file, '@handbook_url' => 'http://drupal.org/server-permissions')), 'error'); + if ($writable == TRUE) { + $requirements['config file permisions'] = array( + 'title' => st('Config File Permission'), + 'value' => st('Writeable'), + ); + } + else { + $requirements['config file permisions'] = array( + 'title' => st('Config File Permission'), + 'value' => st('Not writeable'), + 'severity' => 2, + 'description' => st('The Drupal installer needs write permissions to') . $file . st(' in order to continue. For more information, please see INSTALL.txt or the ') . l(st('online handbook'),'http://drupal.org/server-permissions') . '.', + ); } } - // Check the other requirements. - $requirements = drupal_check_profile($profile); $severity = drupal_requirements_severity($requirements); - // If there are issues, report them. if ($severity == REQUIREMENT_ERROR) { - - foreach ($requirements as $requirement) { - if (isset($requirement['severity']) && $requirement['severity'] == REQUIREMENT_ERROR) { - $message = $requirement['description']; - if (isset($requirement['value']) && $requirement['value']) { - $message .= ' (' . st('Currently using !item !version', array('!item' => $requirement['title'], '!version' => $requirement['value'])) . ')'; - } - drupal_set_message($message, 'error'); - } - } - } - if ($severity == REQUIREMENT_WARNING) { - - foreach ($requirements as $requirement) { - if (isset($requirement['severity']) && $requirement['severity'] == REQUIREMENT_WARNING) { - $message = $requirement['description']; - if (isset($requirement['value']) && $requirement['value']) { - $message .= ' (' . st('Currently using !item !version', array('!item' => $requirement['title'], '!version' => $requirement['value'])) . ')'; - } - drupal_set_message($message, 'warning'); - } - } + install_task_list('requirements'); + drupal_set_title(st('Requirements problem')); + $status_report = theme('status_report', $requirements); + $status_report .= st('Please check the error messages and try again.'); + print theme('install_page', $status_report); + exit; } }