Index: includes/file.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/file.inc,v
retrieving revision 1.86
diff -u -p -r1.86 file.inc
--- includes/file.inc	17 Oct 2006 19:29:26 -0000	1.86
+++ includes/file.inc	21 Nov 2006 07:04:10 -0000
@@ -709,7 +709,7 @@ function file_directory_temp() {
  * @return A string containing the path to Drupal's 'files' directory.
  */
 function file_directory_path() {
-  return variable_get('file_directory_path', 'files');
+  return variable_get('file_directory_path', conf_path().'/files');
 }
 
 /**
Index: modules/color/color.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/color/color.module,v
retrieving revision 1.7
diff -u -p -r1.7 color.module
--- modules/color/color.module	10 Nov 2006 19:59:30 -0000	1.7
+++ modules/color/color.module	21 Nov 2006 07:04:11 -0000
@@ -210,7 +210,7 @@ function color_scheme_form_submit($form_
 
   // Prepare target locations for generated files
   $id = $theme .'-'. substr(md5(serialize($palette) . microtime()), 0, 8);
-  $paths['color'] = variable_get('file_directory_path', 'files') .'/color';
+  $paths['color'] = file_directory_path() . '/color';
   $paths['target'] = $paths['color'] .'/'. $id .'/';
   foreach ($paths as $path) {
     if (!is_dir($path)) {