Index: includes/file.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/file.inc,v
retrieving revision 1.44
diff -u -F^f -r1.44 file.inc
--- includes/file.inc	18 May 2005 05:17:11 -0000	1.44
+++ includes/file.inc	22 May 2005 21:38:18 -0000
@@ -29,12 +29,12 @@
  * @return URL pointing to the file
  */
 function file_create_url($path) {
-  if (strpos($path, variable_get('file_directory_path', 'files')) !== false) {
-    $path = trim(substr($path, strlen(variable_get('file_directory_path', 'files'))), '\\/');
+  if (strpos($path, variable_get('file_directory_path', conf_init() .'/files')) !== false) {
+    $path = trim(substr($path, strlen(variable_get('file_directory_path', conf_init() .'/files'))), '\\/');
   }
   switch (variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC)) {
     case FILE_DOWNLOADS_PUBLIC:
-      return $GLOBALS['base_url'] .'/'. variable_get('file_directory_path', 'files') .'/'. str_replace('\\', '/', $path);
+      return $GLOBALS['base_url'] .'/'. variable_get('file_directory_path', conf_init() .'/files') .'/'. str_replace('\\', '/', $path);
     case FILE_DOWNLOADS_PRIVATE:
       return url('system/files', 'file='. $path);
   }
@@ -50,7 +50,7 @@ function file_create_url($path) {
  *         Returns FALSE if the path is invalid (i.e. outside the configured 'files'-directory).
  */
 function file_create_path($dest = 0) {
-  $file_path = variable_get('file_directory_path', 'files');
+  $file_path = variable_get('file_directory_path', conf_init() .'/files');
   if (!$dest) {
     return $file_path;
   }
Index: modules/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system.module,v
retrieving revision 1.211
diff -u -F^f -r1.211 system.module
--- modules/system.module	21 May 2005 11:33:03 -0000	1.211
+++ modules/system.module	22 May 2005 21:38:29 -0000
@@ -221,7 +221,7 @@ function system_view_general() {
   $output .= form_group(t('Cache settings'), $group);
 
   // File system:
-  $directory_path = variable_get('file_directory_path', 'files');
+  $directory_path = variable_get('file_directory_path', conf_init() .'/files');
   file_check_directory($directory_path, FILE_CREATE_DIRECTORY, 'file_directory_path');
 
   $directory_temp = variable_get('file_directory_temp', FILE_DIRECTORY_TEMP);
@@ -641,7 +641,7 @@ 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');
+    file_check_directory(variable_get('file_directory_path', conf_init() .'/files'), 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.473
diff -u -F^f -r1.473 user.module
--- modules/user.module	21 May 2005 11:57:59 -0000	1.473
+++ modules/user.module	22 May 2005 21:38:53 -0000
@@ -1332,7 +1332,7 @@ function user_configure_settings() {
   file_check_directory(file_create_path(variable_get('user_picture_path', 'pictures')), 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') .'/')));
+  $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', conf_init() .'/files') .'/')));
   $group .= form_textfield(t('Default picture'), 'user_picture_default', variable_get('user_picture_default', ''), 45, 255, t('URL of picture to display for users with no custom picture selected. Leave blank for none.'));
   $group .= form_textfield(t('Picture maximum dimensions'), 'user_picture_dimensions', variable_get('user_picture_dimensions', '85x85'), 10, 10, t('Maximum dimensions for pictures.'));
   $group .= form_textfield(t('Picture maximum file size'), 'user_picture_file_size', variable_get('user_picture_file_size', '30'), 10, 10, t('Maximum file size for pictures, in kB.'));