summaryrefslogtreecommitdiff
path: root/includes/file.inc
diff options
context:
space:
mode:
Diffstat (limited to 'includes/file.inc')
-rw-r--r--includes/file.inc6
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;