From 6395a07329e9a67e7750b7b9023d1479e577980f Mon Sep 17 00:00:00 2001 From: webchick Date: Fri, 30 Sep 2011 19:49:01 -0700 Subject: Oops. Rollback of #951644 which was accidentally committed. --- includes/install.core.inc | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'includes/install.core.inc') diff --git a/includes/install.core.inc b/includes/install.core.inc index 094c9b871..a74dfdf0f 100644 --- a/includes/install.core.inc +++ b/includes/install.core.inc @@ -710,10 +710,8 @@ function install_display_output($output, $install_state) { * * @return * A themed status report, or an exception if there are requirement errors. - * If there are only requirement warnings, a themed status report is shown - * initially, but the user is allowed to bypass it by providing 'continue=1' - * in the URL. Otherwise, no output is returned, so that the next task can be - * run in the same page request. + * Otherwise, no output is returned, so that the next task can be run + * in the same page request. */ function install_verify_requirements(&$install_state) { // Check the installation requirements for Drupal and this profile. @@ -725,30 +723,22 @@ function install_verify_requirements(&$install_state) { // Check the severity of the requirements reported. $severity = drupal_requirements_severity($requirements); - // If there are errors, always display them. If there are only warnings, skip - // them if the user has provided a URL parameter acknowledging the warnings - // and indicating a desire to continue anyway. See drupal_requirements_url(). - if ($severity == REQUIREMENT_ERROR || ($severity == REQUIREMENT_WARNING && empty($install_state['parameters']['continue']))) { + if ($severity == REQUIREMENT_ERROR) { if ($install_state['interactive']) { drupal_set_title(st('Requirements problem')); $status_report = theme('status_report', array('requirements' => $requirements)); - $status_report .= st('Check the error messages and proceed with the installation.', array('!url' => check_url(drupal_requirements_url($severity)))); + $status_report .= st('Check the error messages and proceed with the installation.', array('!url' => check_url(request_uri()))); return $status_report; } else { - // Throw an exception showing any unmet requirements. + // Throw an exception showing all unmet requirements. $failures = array(); foreach ($requirements as $requirement) { - // Skip warnings altogether for non-interactive installations; these - // proceed in a single request so there is no good opportunity (and no - // good method) to warn the user anyway. if (isset($requirement['severity']) && $requirement['severity'] == REQUIREMENT_ERROR) { $failures[] = $requirement['title'] . ': ' . $requirement['value'] . "\n\n" . $requirement['description']; } } - if (!empty($failures)) { - throw new Exception(implode("\n\n", $failures)); - } + throw new Exception(implode("\n\n", $failures)); } } } -- cgit v1.2.3