stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-10 17:29:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Partially revert r20906 -- it was breaking the test framework.

Browse Source
This commit is contained in:
Bharat Mediratta
2009-05-24 18:27:14 +00:00
parent 32a2100217
commit 2fd39bb5b6
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/helpers/module.php
View File

@@ -151,12 +151,17 @@ class module_Core {
// Reload module list from the config file since we'll do a refresh after calling install()
$core = Kohana::config_load("core");
$kohana_modules = $core["modules"];
$modules = ORM::factory("module")->where("name <>", "core")->find_all();
$modules = ORM::factory("module")->find_all();
foreach ($modules as $module) {
self::$module_names[$module->name] = $module->name;
self::$modules[$module->name] = $module;
$kohana_modules[] = MODPATH . $module->name;
// @todo For some reason if we don't load the core module here, the test framework fails.
// This requires some investigation.
if ($module->name != "core") {
$kohana_modules[] = MODPATH . $module->name;
}
}
Kohana::config_set("core.modules", $kohana_modules);