diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-10-05 06:23:18 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-10-05 06:23:18 +0000 |
| commit | 57759f5a8ddc85231ea2ab61d707a062dbaae000 (patch) | |
| tree | 849acaa84a6cf72bcc0f84bf7fe96c8a54e93046 /includes/file.inc | |
| parent | 5d76008993fc7edc5d4c1aedba8af81b36d1554e (diff) | |
| download | brdo-57759f5a8ddc85231ea2ab61d707a062dbaae000.tar.gz brdo-57759f5a8ddc85231ea2ab61d707a062dbaae000.tar.bz2 | |
#930122 by dww: Regression: temp directory handling broken by confusion between file_directory_temp and file_temporary_path.
Diffstat (limited to 'includes/file.inc')
| -rw-r--r-- | includes/file.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/file.inc b/includes/file.inc index fa72e195f..715ab7ed3 100644 --- a/includes/file.inc +++ b/includes/file.inc @@ -2277,9 +2277,9 @@ function drupal_tempnam($directory, $prefix) { * Get the path of system-appropriate temporary directory. */ function file_directory_temp() { - $temporary_directory = variable_get('file_directory_temp', NULL); + $temporary_directory = variable_get('file_temporary_path', NULL); - if (!isset($temporary_directory)) { + if (empty($temporary_directory)) { $directories = array(); // Has PHP been set with an upload_tmp_dir? @@ -2316,7 +2316,7 @@ function file_directory_temp() { $temporary_directory = variable_get('file_public_path', conf_path() . '/files') . $path_delimiter . 'tmp'; } // Save the path of the discovered directory. - variable_set('file_directory_temp', $temporary_directory); + variable_set('file_temporary_path', $temporary_directory); } return $temporary_directory; |