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

#515280 by drewish: Allow file_create_directory() to create recursively, taking advantage of PHP 5.

merge-requests/26/head
Angie Byron 2009-07-10 03:46:33 +00:00
parent 6dee32f96c
commit 0f3761b99d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/file.inc
View File

@ -156,7 +156,9 @@ function file_check_directory(&$directory, $mode = 0, $form_item = NULL) {
// Check if directory exists. // Check if directory exists.
if (!is_dir($directory)) { if (!is_dir($directory)) {
if (($mode & FILE_CREATE_DIRECTORY) && @mkdir($directory)) { // Let mkdir() recursively create directories and use the default directory
// permissions.
if (($mode & FILE_CREATE_DIRECTORY) && @mkdir($directory, variable_get('file_chmod_directory', 0775), TRUE)) {
drupal_chmod($directory); drupal_chmod($directory);
} }
else { else {

2
modules/simpletest/tests/file.test
View File

@ -672,7 +672,7 @@ class FileDirectoryTest extends FileTestCase {
*/ */
function testFileCheckDirectory() { function testFileCheckDirectory() {
// A directory to operate on. // A directory to operate on.
$directory = file_directory_path() . '/' . $this->randomName(); $directory = file_directory_path() . '/' . $this->randomName() . '/' . $this->randomName();
$this->assertFalse(is_dir($directory), t('Directory does not exist prior to testing.')); $this->assertFalse(is_dir($directory), t('Directory does not exist prior to testing.'));
// Non-existent directory. // Non-existent directory.