diff options
| -rw-r--r-- | includes/file.inc | 16 | ||||
| -rw-r--r-- | modules/upload/upload.module | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/includes/file.inc b/includes/file.inc index 51ffcc36e..26227d529 100644 --- a/includes/file.inc +++ b/includes/file.inc @@ -460,9 +460,6 @@ function file_space_used($uid = NULL) { * * @param $source * A string specifying the name of the upload field to save. - * @param $dest - * A string containing the directory $source should be copied to. If this is - * not provided, the temporary directory will be used. * @param $validators * An optional, associative array of callback functions used to validate the * file. The keys are function names and the values arrays of callback @@ -470,6 +467,9 @@ function file_space_used($uid = NULL) { * functions should return an array of error messages, an empty array * indicates that the file passed validation. The functions will be called in * the order specified. + * @param $dest + * A string containing the directory $source should be copied to. If this is + * not provided or is not writable, the temporary directory will be used. * @param $replace * A boolean indicating whether an existing file of the same name in the * destination directory should overwritten. A false value will generate a @@ -536,12 +536,14 @@ function file_save_upload($source, $validators = array(), $dest = FALSE, $replac $file->filename .= '.txt'; } - // Create temporary name/path for newly uploaded files. - if (!$dest) { - $dest = file_destination(file_create_path($file->filename), FILE_EXISTS_RENAME); + // If the destination is not provided, or is not writable, then use the + // temporary directory. + if (empty($dest) || file_check_path($dest) === FALSE) { + $dest = file_directory_temp(); } + $file->source = $source; - $file->destination = $dest; + $file->destination = file_destination(file_create_path($dest .'/'. $file->filename), FILE_EXISTS_RENAME); $file->filesize = $_FILES['files']['size'][$source]; // Call the validation functions. diff --git a/modules/upload/upload.module b/modules/upload/upload.module index d4e02a751..79eb321b9 100644 --- a/modules/upload/upload.module +++ b/modules/upload/upload.module @@ -183,7 +183,7 @@ function upload_node_form_submit($form, &$form_state) { ); // Save new file uploads. - if (($user->uid != 1 || user_access('upload files')) && ($file = file_save_upload('upload', $validators))) { + if (($user->uid != 1 || user_access('upload files')) && ($file = file_save_upload('upload', $validators, file_directory_path()))) { $file->list = variable_get('upload_list_default', 1); $file->description = $file->filename; $_SESSION['upload_current_file'] = $file->fid; |