Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#625744 by boombatower: Fixed discovery logic of multiple module copies.

merge-requests/26/head
Angie Byron 2009-11-11 06:48:28 +00:00
parent 28f8c5e862
commit d5f071f8d3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/simpletest/tests/module.test
View File

@ -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)));
}

6
modules/system/system.module
View File

@ -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');