Index: modules/file/file.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/file/file.module,v
retrieving revision 1.31
diff -u -p -r1.31 file.module
--- modules/file/file.module	2 Jul 2010 12:37:57 -0000	1.31
+++ modules/file/file.module	18 Jul 2010 02:47:46 -0000
@@ -1013,7 +1013,7 @@ function file_get_file_reference_count($
  *   An integer value.
  */
 function file_get_file_references($file, $field = NULL, $age = FIELD_LOAD_REVISION, $field_type = 'file') {
-  $references = drupal_static(__FUNCTION__, array());
+  $references = &drupal_static(__FUNCTION__, array());
   $fields = isset($field) ? array($field['field_name'] => $field) : field_info_fields();
 
   foreach ($fields as $field_name => $file_field) {
Index: modules/simpletest/tests/module.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/module.test,v
retrieving revision 1.21
diff -u -p -r1.21 module.test
--- modules/simpletest/tests/module.test	22 Apr 2010 18:56:31 -0000	1.21
+++ modules/simpletest/tests/module.test	18 Jul 2010 02:47:46 -0000
@@ -106,7 +106,7 @@ class ModuleUnitTest extends DrupalWebTe
 
     module_load_include('inc', 'module_test', 'module_test.file');
     $modules = module_implements('test_hook');
-    $static = drupal_static('module_implements');
+    $static = &drupal_static('module_implements');
     $this->assertTrue(in_array('module_test', $modules), 'Hook found.');
     $this->assertEqual($static['test_hook']['module_test'], 'file', 'Include file detected.');
   }