Oops. Rollback of #951644 which was accidentally committed.

2 files changed, 7 insertions, 78 deletions

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 <a href="!url">proceed with the installation</a>.', array('!url' => check_url(drupal_requirements_url($severity))));
+      $status_report .= st('Check the error messages and <a href="!url">proceed with the installation</a>.', 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));
     }
   }
 }
diff --git a/includes/install.inc b/includes/install.inc
index 88a663a4f..089cdee8f 100644
--- a/includes/install.inc
+++ b/includes/install.inc
@@ -999,6 +999,7 @@ function drupal_install_fix_file($file, $mask, $message = TRUE) {
   }
 }
 
+
 /**
  * Send the user to a different installer page.
  *
@@ -1016,68 +1017,6 @@ function install_goto($path) {
 }
 
 /**
- * Returns the URL of the current script, with modified query parameters.
- *
- * This function can be called by low-level scripts (such as install.php and
- * update.php) and returns the URL of the current script. Existing query
- * parameters are preserved by default, but new ones can optionally be merged
- * in.
- *
- * This function is used when the script must maintain certain query parameters
- * over multiple page requests in order to work correctly. In such cases (for
- * example, update.php, which requires the 'continue=1' parameter to remain in
- * the URL throughout the update process if there are any requirement warnings
- * that need to be bypassed), using this function to generate the URL for links
- * to the next steps of the script ensures that the links will work correctly.
- *
- * @param $query
- *   (optional) An array of query parameters to merge in to the existing ones.
- *
- * @return
- *   The URL of the current script, with query parameters modified by the
- *   passed-in $query. The URL is not sanitized, so it still needs to be run
- *   through check_url() if it will be used as an HTML attribute value.
- *
- * @see drupal_requirements_url()
- */
-function drupal_current_script_url($query = array()) {
-  $uri = $_SERVER['SCRIPT_NAME'];
-  $query = array_merge(drupal_get_query_parameters(), $query);
-  if (!empty($query)) {
-    $uri .= '?' . drupal_http_build_query($query);
-  }
-  return $uri;
-}
-
-/**
- * Returns a URL for proceeding to the next page after a requirements problem.
- *
- * This function can be called by low-level scripts (such as install.php and
- * update.php) and returns a URL that can be used to attempt to proceed to the
- * next step of the script.
- *
- * @param $severity
- *   The severity of the requirements problem, as returned by
- *   drupal_requirements_severity().
- *
- * @return
- *   A URL for attempting to proceed to the next step of the script. The URL is
- *   not sanitized, so it still needs to be run through check_url() if it will
- *   be used as an HTML attribute value.
- *
- * @see drupal_current_script_url()
- */
-function drupal_requirements_url($severity) {
-  $query = array();
-  // If there are no errors, only warnings, append 'continue=1' to the URL so
-  // the user can bypass this screen on the next page load.
-  if ($severity == REQUIREMENT_WARNING) {
-    $query['continue'] = 1;
-  }
-  return drupal_current_script_url($query);
-}
-
-/**
  * Functional equivalent of t(), used when some systems are not available.
  *
  * Used during the install process, when database, theme, and localization