Index: modules/file/file.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/file/file.module,v
retrieving revision 1.33
diff -u -p -r1.33 file.module
--- modules/file/file.module	2 Aug 2010 13:26:40 -0000	1.33
+++ modules/file/file.module	17 Aug 2010 19:10:44 -0000
@@ -125,9 +125,14 @@ function file_file_download($uri, $field
   // Get the file record based on the URI. If not in the database just return.
   $files = file_load_multiple(array(), array('uri' => $uri));
   if (count($files)) {
-    $file = reset($files);
+    foreach ($files as $item) {
+      if ($item->uri === $uri) {
+        $file = $item;
+        break;
+      }
+    }
   }
-  else {
+  if (!isset($file)) {
     return;
   }