Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #334948 by David_Rothstein, Albert Volkman: Fixed The 'default' folder is sometimes required to be writable even when installing Drupal in sites/example.com.

8.0.x
Nathaniel 2012-02-14 12:39:35 +09:00
parent 07d4c5569f
commit 8e7a80bb0f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/modules/system/system.install
View File

@ -292,8 +292,13 @@ function system_requirements($phase) {
} }
// Test files directories. // Test files directories.
// If we are installing Drupal, the settings.php file might not exist yet in
// the intended conf_path() directory, so don't require it. The conf_path()
// cache must also be reset in this case.
$require_settings = ($phase != 'install');
$reset_cache = !$require_settings;
$directories = array( $directories = array(
variable_get('file_public_path', conf_path() . '/files'), variable_get('file_public_path', conf_path($require_settings, $reset_cache) . '/files'),
// By default no private files directory is configured. For private files // By default no private files directory is configured. For private files
// to be secure the admin needs to provide a path outside the webroot. // to be secure the admin needs to provide a path outside the webroot.
variable_get('file_private_path', FALSE), variable_get('file_private_path', FALSE),