Index: includes/file.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/file.inc,v
retrieving revision 1.97
diff -u -r1.97 file.inc
--- includes/file.inc	24 Apr 2007 13:53:10 -0000	1.97
+++ includes/file.inc	17 May 2007 11:02:57 -0000
@@ -712,7 +712,7 @@
  * @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.20
diff -u -r1.20 color.module
--- modules/color/color.module	14 May 2007 13:43:34 -0000	1.20
+++ modules/color/color.module	17 May 2007 11:02:57 -0000
@@ -238,7 +238,7 @@
 
   // 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)) {