From 782d1155c62c0a879bf587c7e40c3a13bcf6879c Mon Sep 17 00:00:00 2001 From: David Rothstein Date: Wed, 20 Nov 2013 15:45:59 -0500 Subject: Drupal 7.24 --- includes/install.core.inc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'includes/install.core.inc') diff --git a/includes/install.core.inc b/includes/install.core.inc index 7a694e9bb..83f18735a 100644 --- a/includes/install.core.inc +++ b/includes/install.core.inc @@ -766,6 +766,15 @@ function install_system_module(&$install_state) { // Install system.module. drupal_install_system(); + // Call file_ensure_htaccess() to ensure that all of Drupal's standard + // directories (e.g., the public and private files directories) have + // appropriate .htaccess files. These directories will have already been + // created by this point in the installer, since Drupal creates them during + // the install_verify_requirements() task. Note that we cannot call + // file_ensure_htaccess() any earlier than this, since it relies on + // system.module in order to work. + file_ensure_htaccess(); + // Enable the user module so that sessions can be recorded during the // upcoming bootstrap step. module_enable(array('user'), FALSE); @@ -981,7 +990,7 @@ function install_settings_form_submit($form, &$form_state) { 'required' => TRUE, ); $settings['drupal_hash_salt'] = array( - 'value' => drupal_hash_base64(drupal_random_bytes(55)), + 'value' => drupal_random_key(), 'required' => TRUE, ); drupal_rewrite_settings($settings); -- cgit v1.2.3