? modules/simpletest/tests/form.test.marker
Index: includes/file.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/file.inc,v
retrieving revision 1.234
diff -u -p -r1.234 file.inc
--- includes/file.inc	1 Oct 2010 06:37:39 -0000	1.234
+++ includes/file.inc	3 Oct 2010 19:36:35 -0000
@@ -2277,9 +2277,9 @@ function drupal_tempnam($directory, $pre
  * 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;
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.969
diff -u -p -r1.969 system.module
--- modules/system/system.module	1 Oct 2010 18:37:23 -0000	1.969
+++ modules/system/system.module	3 Oct 2010 19:36:38 -0000
@@ -2073,9 +2073,10 @@ function system_admin_menu_block($item) 
 }
 
 /**
- * Checks the existence of the directory specified in $form_element. This
- * function is called from the system_settings form to check both core file
- * directories (file_public_path, file_private_path, file_temporary_path).
+ * Checks the existence of the directory specified in $form_element.
+ *
+ * This function is called from the system_settings form to check all core
+ * file directories (file_public_path, file_private_path, file_temporary_path).
  *
  * @param $form_element
  *   The form element containing the name of the directory to check.
cvs diff: Diffing modules/simpletest
cvs diff: Diffing modules/simpletest/files
cvs diff: Diffing modules/simpletest/files/css_test_files
cvs diff: Diffing modules/simpletest/tests
Index: modules/simpletest/tests/file.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/file.test,v
retrieving revision 1.70
diff -u -p -r1.70 file.test
--- modules/simpletest/tests/file.test	28 Sep 2010 02:34:42 -0000	1.70
+++ modules/simpletest/tests/file.test	3 Oct 2010 19:36:40 -0000
@@ -972,8 +972,19 @@ class FileDirectoryTest extends FileTest
     $path = file_destination($destination, FILE_EXISTS_ERROR);
     $this->assertEqual($path, FALSE, t('An error is returned when filepath destination already exists with FILE_EXISTS_ERROR.'), 'File');
   }
-}
 
+  /**
+   * Ensure that the file_directory_temp() function always returns a value.
+   */
+  function testFileDirectoryTemp() {
+    // Start with an empty variable to ensure we have a clean slate.
+    variable_set('file_temporary_path', '');
+    $tmp_directory = file_directory_temp();
+    $this->assertEqual(empty($tmp_directory), FALSE, t('file_directory_temp() returned a non-empty value.'));
+    $setting = variable_get('file_temporary_path', '');
+    $this->assertEqual($setting, $tmp_directory, t("The 'file_temporary_path' variable has the same value that file_directory_temp() returned."));
+  }
+}
 
 /**
  * Tests the file_scan_directory() function.
cvs diff: Diffing modules/simpletest/tests/upgrade