#194369 by lots of contributors: move default files directory to sites/default/files which can be created automatically on install, so no need to bug the user about it, making the install process easier

1 files changed, 19 insertions, 17 deletions

diff --git a/install.php b/install.php
index d0c7dd925..70087c883 100644
--- a/install.php
+++ b/install.php
@@ -858,24 +858,8 @@ function install_reserved_tasks() {
  * Check installation requirements and report any errors.
  */
 function install_check_requirements($profile, $verify) {
-  $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 Drupal is not set up already, we also need to create a settings file.
+  // If Drupal is not set up already, we need to create a settings file.
   if (!$verify) {
     $writable = FALSE;
     $conf_path = './'. conf_path();
@@ -899,6 +883,24 @@ function install_check_requirements($profile, $verify) {
       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 <a href="@handbook_url">on-line handbook</a>.', array('@drupal' => drupal_install_profile_name(), '%file' => $file, '@handbook_url' => 'http://drupal.org/server-permissions')), 'error');
     }
   }
+
+  // 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');
+      }
+    }
+  }
 }
 
 /**