=== modified file 'uc_file/uc_file.module'
--- uc_file/uc_file.module	2009-04-28 16:54:42 +0000
+++ uc_file/uc_file.module	2009-05-04 13:21:58 +0000
@@ -21,7 +21,7 @@ require_once('uc_file.ca.inc');
 define('UC_FILE_PAGER_SIZE', 50);
 define('UC_FILE_LIMIT_SENTINEL', -1);
 
-global $cache;
+global $uc_file_cache;
 
 /* **************************************************************************** *
  *  Hook Functions (Drupal)                                                     *
@@ -1553,9 +1553,9 @@ function uc_file_remove_user_file_by_id(
  * Flush our cache.
  */
 function _uc_file_flush_cache() {
-  global $cache;
+  global $uc_file_cache;
 
-  $cache = array();
+  $uc_file_cache = array();
 }
 
 /**
@@ -1567,13 +1567,13 @@ function _uc_file_flush_cache() {
  *   A uc_file object.
  */
 function &uc_file_get_by_name($filename) {
-  global $cache;
+  global $uc_file_cache;
 
-  if (!isset($cache[$filename])) {
-    $cache[$filename] = db_fetch_object(db_query("SELECT * FROM {uc_files} WHERE filename = '%s'", $filename));
+  if (!isset($uc_file_cache[$filename])) {
+    $uc_file_cache[$filename] = db_fetch_object(db_query("SELECT * FROM {uc_files} WHERE filename = '%s'", $filename));
   }
 
-  return $cache[$filename];
+  return $uc_file_cache[$filename];
 }
 
 /**
@@ -1585,13 +1585,13 @@ function &uc_file_get_by_name($filename)
  *   A uc_file object.
  */
 function &uc_file_get_by_id($fid) {
-  global $cache;
+  global $uc_file_cache;
 
-  if (!isset($cache[$fid])) {
-    $cache[$fid] = db_fetch_object(db_query("SELECT * FROM {uc_files} WHERE fid = %d", $fid));
+  if (!isset($uc_file_cache[$fid])) {
+    $uc_file_cache[$fid] = db_fetch_object(db_query("SELECT * FROM {uc_files} WHERE fid = %d", $fid));
   }
 
-  return $cache[$fid];
+  return $uc_file_cache[$fid];
 }
 
 /**
@@ -1603,15 +1603,15 @@ function &uc_file_get_by_id($fid) {
  *   A uc_file object.
  */
 function &uc_file_get_by_key($key) {
-  global $cache;
+  global $uc_file_cache;
 
-  if (!isset($cache[$key])) {
-    $cache[$key] = db_fetch_object(db_query("SELECT * FROM {uc_file_users} ufu ".
+  if (!isset($uc_file_cache[$key])) {
+    $uc_file_cache[$key] = db_fetch_object(db_query("SELECT * FROM {uc_file_users} ufu ".
       "LEFT JOIN {uc_files} uf ON uf.fid = ufu.fid ".
       "WHERE ufu.file_key = '%s'", $key));
   }
 
-  return $cache[$key];
+  return $uc_file_cache[$key];
 }
 
 /**