Index: color.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/color/color.module,v
retrieving revision 1.3
diff -u -r1.3 color.module
--- color.module	29 Oct 2006 15:13:01 -0000	1.3
+++ color.module	16 Nov 2006 17:03:36 -0000
@@ -211,7 +211,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['target'] = $paths['color'] .'/'. $id .'/';
+  $paths['target'] = $paths['color'] .'/'. $id;
   foreach ($paths as $path) {
     if (!is_dir($path)) {
       mkdir($path);
@@ -219,20 +219,20 @@
   }
   $paths['id'] = $id;
   $paths['source'] = drupal_get_path('theme', $theme) .'/';
-  $paths['stylesheet'] = $paths['target'] .'style.css';
+  $paths['stylesheet'] = $paths['target'] .'/style.css';
   $paths['files'] = $paths['map'] = array();
 
   // Save palette and stylesheet location
   variable_set('color_'. $theme .'_palette', $palette);
   variable_set('color_'. $theme .'_stylesheet', $paths['stylesheet']);
-  variable_set('color_'. $theme .'_logo', $paths['target'] .'logo.png');
+  variable_set('color_'. $theme .'_logo', $paths['target'] .'/logo.png');
 
   // Copy over neutral images
   foreach ($info['copy'] as $file) {
     $base = basename($file);
-    copy($paths['source'] . $file, $paths['target'] . $base);
+    copy($paths['source'] . $file, $paths['target'] . '/' . $base);
     $paths['map'][$file] = $base;
-    $paths['files'][] = $paths['target'] . $base;
+    $paths['files'][] = $paths['target'] . '/' . $base;
   }
 
   // Render new images
@@ -362,7 +362,7 @@
   foreach ($info['slices'] as $file => $coord) {
     list($x, $y, $width, $height) = $coord;
     $base = basename($file);
-    $image = $paths['target'] . $base;
+    $image = $paths['target'] . '/' . $base;
 
     // Cut out slice
     if ($file == 'screenshot.png') {
@@ -540,4 +540,4 @@
     $h /= 6;
   }
   return array($h, $s, $l);
-}
\ No newline at end of file
+}

