From 57759f5a8ddc85231ea2ab61d707a062dbaae000 Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Tue, 5 Oct 2010 06:23:18 +0000 Subject: #930122 by dww: Regression: temp directory handling broken by confusion between file_directory_temp and file_temporary_path. --- includes/file.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'includes') 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; -- cgit v1.2.3