diff -u b/includes/bootstrap.inc b/includes/bootstrap.inc --- b/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -947,8 +947,8 @@ $file_scans = drupal_array_merge_deep($cache->data, $file_scans); // Set a flag so we remember that we've done a merge with the values // stored in the persistent cache. - $file_scans['#cache_merge_done'] = TRUE; } + $file_scans['#cache_merge_done'] = TRUE; } } catch (Exception $e) { @@ -972,8 +972,7 @@ // location in the {system} table. $system_filepaths = &drupal_static('system_filepaths'); if (isset($system_filepaths[$type][$name]) && $system_filepaths[$type][$name] != $filename_from_file_scan) { - // This file has moved. Store its new location in the file scan - // cache. + // This file has moved. Store its new location in the file scan cache. $file_scans[$type][$name] = $filename_from_file_scan[$type][$name]; // Make sure our change to the file scan cache will be written to // the persistent cache. @@ -1072,7 +1071,6 @@ } } $file_scans['#write_cache'] = NULL; - $file_scans['#cache_merge_done'] = NULL; cache_set('_drupal_get_filename_fallback', $file_scans, 'cache_bootstrap'); } } diff -u b/modules/simpletest/tests/bootstrap.test b/modules/simpletest/tests/bootstrap.test --- b/modules/simpletest/tests/bootstrap.test +++ b/modules/simpletest/tests/bootstrap.test @@ -434,7 +434,8 @@ // Get the missing and moved files static variable. $file_scans = &drupal_static('_drupal_get_filename_fallback'); - // Searching for an item that does not exist creates a record in the static variable. + // Searching for an item that does not exist creates a record in the static + // variable. $this->assertTrue($file_scans['module'][$non_existing_module] === FALSE, 'Searching for an item that does not exist creates a record in the missing and moved files static variable.'); drupal_install_schema('system'); drupal_file_scan_write_cache();