diff --git a/core/includes/file.inc b/core/includes/file.inc index bb537fb..cc13596 100644 --- a/core/includes/file.inc +++ b/core/includes/file.inc @@ -486,7 +486,7 @@ function file_create_url($uri) { * TRUE if the directory exists (or was created) and is writable. FALSE * otherwise. */ -function file_prepare_directory(&$directory, $options = FILE_MODIFY_PERMISSIONS) { +function file_prepare_directory(&$directory, $options = FILE_MODIFY_PERMISSIONS, $mode = NULL) { if (!file_stream_wrapper_valid_scheme(file_uri_scheme($directory))) { // Only trim if we're not dealing with a stream. $directory = rtrim($directory, '/\\'); @@ -497,14 +497,14 @@ function file_prepare_directory(&$directory, $options = FILE_MODIFY_PERMISSIONS) // Let mkdir() recursively create directories and use the default directory // permissions. if ($options & FILE_CREATE_DIRECTORY) { - return @drupal_mkdir($directory, NULL, TRUE); + return @drupal_mkdir($directory, $mode, TRUE); } return FALSE; } // The directory exists, so check to see if it is writable. $writable = is_writable($directory); if (!$writable && ($options & FILE_MODIFY_PERMISSIONS)) { - return drupal_chmod($directory); + return drupal_chmod($directory, $mode); } return $writable; diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 644ec57..b9d73c5 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -181,6 +181,8 @@ function install_state_defaults() { // Whether or not this installation is interactive. By default this will // be set to FALSE if settings are passed in to install_drupal(). 'interactive' => TRUE, + // The mode for directories that are created during install. + 'mode' => NULL, // An array of parameters for the installation, pre-populated by the URL // or by the settings passed in to install_drupal(). This is primarily // used to store 'profile' (the name of the chosen installation profile) @@ -1263,7 +1265,7 @@ function install_settings_form_submit($form, &$form_state) { drupal_rewrite_settings($settings); // Add the config directories to settings.php. - drupal_install_config_directories(); + drupal_install_config_directories($install_state['mode']); // The container is about to be rebuilt so we need to unset the keyvalue // storage override that the installer is using. @@ -2088,9 +2090,9 @@ function install_check_translations($install_state) { $online = FALSE; // First attempt to create or make writable the files directory. - file_prepare_directory($files_directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS); + file_prepare_directory($files_directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS, $install_state['mode']); // Then, attempt to create or make writable the translations directory. - file_prepare_directory($translations_directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS); + file_prepare_directory($translations_directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS, $install_state['mode']); // Get values so the requirements errors can be specific. if (drupal_verify_install_file($translations_directory, FILE_EXIST|FILE_WRITABLE, 'dir')) { diff --git a/core/includes/install.inc b/core/includes/install.inc index 7ee2c6b..69467cf 100644 --- a/core/includes/install.inc +++ b/core/includes/install.inc @@ -437,10 +437,14 @@ function _drupal_rewrite_settings_dump_one(\stdClass $variable, $prefix = '', $s /** * Creates the config directory and ensures it is operational. * + * @param $mode + * Integer value for the permissions. Consult PHP chmod() documentation for + * more information. + * * @see install_settings_form_submit() * @see update_prepare_d8_bootstrap() */ -function drupal_install_config_directories() { +function drupal_install_config_directories($mode = NULL) { global $config_directories; // Add a randomized config directory name to settings.php, unless it was @@ -473,7 +477,7 @@ function drupal_install_config_directories() { // public files directory, which has already been verified to be writable // itself. But if it somehow fails anyway, the installation cannot proceed. // Bail out using a similar error message as in system_requirements(). - if (!install_ensure_config_directory($config_type)) { + if (!install_ensure_config_directory($config_type, $mode)) { throw new Exception(t('The directory %directory could not be created or could not be made writable. To proceed with the installation, either create the directory and modify its permissions manually or ensure that the installer has the permissions to create it automatically. For more information, see the online handbook.', array( '%directory' => config_get_config_directory($config_type), '@handbook_url' => 'http://drupal.org/server-permissions', @@ -539,10 +543,14 @@ function install_verify_config_directory($type) { * Type of config directory to return. Drupal core provides 'active' and * 'staging'. * + * @param $mode + * Integer value for the permissions. Consult PHP chmod() documentation for + * more information. + * * @return bool * TRUE if the config directory exists and is writable. */ -function install_ensure_config_directory($type) { +function install_ensure_config_directory($type, $mode = NULL) { // The config directory must be defined in settings.php. global $config_directories; if (!isset($config_directories[$type])) { @@ -552,7 +560,7 @@ function install_ensure_config_directory($type) { // directories that the installer creates. else { $config_directory = config_get_config_directory($type); - return file_prepare_directory($config_directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS); + return file_prepare_directory($config_directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS, $mode); } } diff --git a/core/modules/image/image.install b/core/modules/image/image.install index 618fe86..9a14749 100644 --- a/core/modules/image/image.install +++ b/core/modules/image/image.install @@ -11,7 +11,8 @@ function image_install() { // Create the styles directory and ensure it's writable. $directory = file_default_scheme() . '://styles'; - file_prepare_directory($directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS); + $mode = isset($GLOBALS['install_state']['mode']) ? $GLOBALS['install_state']['mode'] : NULL; + file_prepare_directory($directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS, $mode); } /** diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 3742dde..879c5b0 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -372,7 +372,8 @@ function system_requirements($phase) { continue; } if ($phase == 'install') { - file_prepare_directory($directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS); + $mode = isset($GLOBALS['install_state']['mode']) ? $GLOBALS['install_state']['mode'] : NULL; + file_prepare_directory($directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS, $mode); } $is_writable = is_writable($directory); $is_directory = is_dir($directory);