Index: upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.module,v
retrieving revision 1.142
diff -u -p -r1.142 upload.module
--- upload.module	28 Nov 2006 02:38:28 -0000	1.142
+++ upload.module	4 Dec 2006 03:37:47 -0000
@@ -377,7 +377,12 @@ function upload_form_alter($form_id, &$f
 
       // Make sure necessary directories for upload.module exist and are
       // writable before displaying the attachment form.
-      if (!file_check_directory(file_directory_path(), FILE_CREATE_DIRECTORY) || !file_check_directory(file_directory_temp(), FILE_CREATE_DIRECTORY)) {
+
+      // Create variables for the default 'files' and temp directories to be
+      // passed by reference.
+      $dir_path = file_directory_path();
+      $dir_temp = file_directory_temp();
+      if (!file_check_directory($dir_path, FILE_CREATE_DIRECTORY) || !file_check_directory($dir_temp, FILE_CREATE_DIRECTORY)) {
         $form['attachments']['#description'] =  t('File attachments are disabled. The file directories have not been properly configured.');
         if (user_access('administer site configuration')) {
           $form['attachments']['#description'] .= ' '. t('Please visit the <a href="@admin-file-system">file system configuration page</a>.', array('@admin-file-system' => url('admin/settings/file-system')));