? .DS_Store
? .cache
? .cvsignore
? .git
? .project
? .settings
? modules/.DS_Store
? sites/all/modules
? sites/default/files
? sites/default/settings.php
? sites/default/test
Index: modules/aggregator/aggregator.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.test,v
retrieving revision 1.7
diff -u -p -r1.7 aggregator.test
--- modules/aggregator/aggregator.test	3 Sep 2008 19:25:08 -0000	1.7
+++ modules/aggregator/aggregator.test	15 Sep 2008 20:07:42 -0000
@@ -151,8 +151,7 @@ class AggregatorTestCase extends DrupalW
 EOF;
 
     $path = file_directory_path() . '/valid-opml.xml';
-    file_save_data($opml, $path);
-    return $path;
+    return file_save_data($opml, $path);
   }
 
   /**
@@ -169,8 +168,7 @@ EOF;
 EOF;
 
     $path = file_directory_path() . '/invalid-opml.xml';
-    file_save_data($opml, $path);
-    return $path;
+    return file_save_data($opml, $path);
   }
 
   /**
@@ -192,8 +190,7 @@ EOF;
 EOF;
 
     $path = file_directory_path() . '/empty-opml.xml';
-    file_save_data($opml, $path);
-    return $path;
+    return file_save_data($opml, $path);
   }
 
   function getRSS091Sample() {
@@ -226,8 +223,7 @@ EOF;
 EOT;
 
     $path = file_directory_path() . '/rss091.xml';
-    file_save_data($feed, $path);
-    return $path;
+    return file_save_data($feed, $path);
   }
 }
 
Index: modules/color/color.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/color/color.module,v
retrieving revision 1.44
diff -u -p -r1.44 color.module
--- modules/color/color.module	15 Sep 2008 09:28:49 -0000	1.44
+++ modules/color/color.module	15 Sep 2008 20:07:42 -0000
@@ -308,9 +308,9 @@ function color_scheme_form_submit($form,
   foreach ($info['copy'] as $file) {
     $base = basename($file);
     $source = $paths['source'] . $file;
-    file_copy($source, $paths['target'] . $base);
+    $filepath = file_copy($source, $paths['target'] . $base);
     $paths['map'][$file] = $base;
-    $paths['files'][] = $paths['target'] . $base;
+    $paths['files'][] = $filepath;
   }
 
   // Render new images, if image has been provided.
Index: modules/simpletest/tests/file.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/file.test,v
retrieving revision 1.2
diff -u -p -r1.2 file.test
--- modules/simpletest/tests/file.test	15 Sep 2008 16:10:12 -0000	1.2
+++ modules/simpletest/tests/file.test	15 Sep 2008 20:07:42 -0000
@@ -128,7 +128,7 @@ class FileValidateTest extends DrupalWeb
     }
 
     // Clear out any resizing messages.
-#    drupal_get_messages();
+    drupal_get_messages();
   }
 
   /**