diff options
| -rw-r--r-- | modules/simpletest/tests/module.test | 2 | ||||
| -rw-r--r-- | modules/system/system.module | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/modules/simpletest/tests/module.test b/modules/simpletest/tests/module.test index 059672e5c..c77f0a776 100644 --- a/modules/simpletest/tests/module.test +++ b/modules/simpletest/tests/module.test @@ -77,7 +77,7 @@ class ModuleUnitTest extends DrupalWebTestCase { */ protected function assertModuleList(Array $expected_values, $condition) { $expected_values = array_combine($expected_values, $expected_values); - $this->assertIdentical($expected_values, module_list(), t('@condition: module_list() returns correct results', array('@condition' => $condition))); + $this->assertEqual($expected_values, module_list(), t('@condition: module_list() returns correct results', array('@condition' => $condition))); ksort($expected_values); $this->assertIdentical($expected_values, module_list(FALSE, FALSE, TRUE), t('@condition: module_list() returns correctly sorted results', array('@condition' => $condition))); } diff --git a/modules/system/system.module b/modules/system/system.module index 636ce7f30..25ad496e5 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -1978,7 +1978,7 @@ function system_get_files_database(&$files, $type) { if (isset($files[$file->name]) && is_object($files[$file->name])) { $file->uri = $file->filename; foreach ($file as $key => $value) { - if (!isset($files[$file->name]->key)) { + if (!isset($files[$file->name]->$key)) { $files[$file->name]->$key = $value; } } @@ -2122,6 +2122,10 @@ function _system_rebuild_module_data() { // Read info files for each module. foreach ($modules as $key => $module) { + // The module system uses the key 'filename' instead of 'uri' so copy the + // value so it will be used by the modules system. + $modules[$key]->filename = $module->uri; + // Look for the info file. $module->info = drupal_parse_info_file(dirname($module->uri) . '/' . $module->name . '.info'); |