stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-22 23:05:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clear out module list in load_modules() before trying any db operations

Browse Source
This commit is contained in:
Bharat Mediratta
2008-12-17 19:04:20 +00:00
parent d1c737ffac
commit 26f0b4e44d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/helpers/module.php
+6 -5
View File
@@ -111,6 +111,12 @@ class module_Core {
}
public static function load_modules() {
// 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'];
self::$module_names = array();
self::$modules = array();
// This is one of the first database operations that we'll do, so it may fail if there's no
// install yet. Try to handle this situation gracefully expecting that the scaffolding will
// Do The Right Thing.
@@ -122,11 +128,6 @@ class module_Core {
return;
}
// 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'];
self::$module_names = array();
self::$modules = array();
try {
foreach ($modules as $module) {
self::$module_names[] = $module->name;