Index: modules/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system.module,v
retrieving revision 1.204.2.3
diff -u -u -F^f -r1.204.2.3 system.module
--- modules/system.module	1 Jun 2005 04:17:17 -0000	1.204.2.3
+++ modules/system.module	30 Jun 2005 00:33:10 -0000
@@ -650,7 +650,8 @@ function system_theme_settings($key = ''
     $group = form_checkbox(t('Use the default logo'), "$var][default_logo", 1, $settings['default_logo'], t('Check here if you want the theme to use the logo supplied with it.'));
     $group .= form_textfield(t('Path to custom logo'), "$var][logo_path", $settings['logo_path'], 50, 128, t('The path to the file you would like to use as your logo file instead of the default logo.'));
 
-    file_check_directory(variable_get('file_directory_path', 'files'), FILE_CREATE_DIRECTORY, 'file_directory_path');
+    $directory_path = variable_get('file_directory_path', 'files');
+    file_check_directory($directory_path, FILE_CREATE_DIRECTORY, 'file_directory_path');
     $group .= form_file(t('Upload logo image'), 'logo_upload', 40, t("If you don't have direct file access to the server, use this field to upload your logo."));
     $group .= form_button(t('Upload'), 'fileop');
 
Index: modules/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.454.2.13
diff -u -u -F^f -r1.454.2.13 user.module
--- modules/user.module	1 Jun 2005 20:16:04 -0000	1.454.2.13
+++ modules/user.module	30 Jun 2005 00:33:12 -0000
@@ -1290,7 +1290,8 @@ function user_configure_settings() {
   $output .= form_group(t('User email settings'), $group);
 
   // Picture settings.
-  file_check_directory(file_create_path(variable_get('user_picture_path', 'pictures')), 1, 'user_picture_path');
+  $picture_path = file_create_path(variable_get('user_picture_path', 'pictures'));
+  file_check_directory($picture_path, 1, 'user_picture_path');
 
   $group  = form_radios(t('Picture support'), 'user_pictures', variable_get('user_pictures', 0), array(t('Disabled'), t('Enabled')), t('Enable picture support.'));
   $group .= form_textfield(t('Picture image path'), 'user_picture_path', variable_get('user_picture_path', 'pictures'), 45, 255, t('Subdirectory in the directory "%dir" where pictures will be stored.', array('%dir' => variable_get('file_directory_path', 'files') .'/')));