From 2fd39bb5b62dcc094defae3c9269d808c48849b3 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 24 May 2009 18:27:14 +0000 Subject: Partially revert r20906 -- it was breaking the test framework. --- core/helpers/module.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'core/helpers/module.php') diff --git a/core/helpers/module.php b/core/helpers/module.php index 233030db..a6fe64b0 100644 --- a/core/helpers/module.php +++ b/core/helpers/module.php @@ -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); -- cgit v1.2.3