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

Merge branch 'master' into talmdal_dev

Browse Source
This commit is contained in:
Tim Almdal
2009-10-23 07:57:12 -07:00
parent 9297325c27 94cd07805d
commit 8a73b81dd9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gallery_unit_test/controllers/gallery_unit_test.php
+6 -5
View File
@@ -96,6 +96,8 @@ class Gallery_Unit_Test_Controller extends Controller {
@system("rm -rf test/var");
@mkdir('test/var/logs', 0777, true);
$active_modules = module::$active;
// Reset our caches
module::$modules = array();
module::$active = array();
@@ -113,13 +115,12 @@ class Gallery_Unit_Test_Controller extends Controller {
module::install("user");
module::activate("user");
$modules = array();
foreach (glob(MODPATH . "*/helpers/*_installer.php") as $file) {
$module_name = basename(dirname(dirname($file)));
if (in_array($module_name, array("gallery", "user"))) {
foreach ($active_modules as $module) {
if (in_array($module->name, array("gallery", "user"))) {
continue;
}
module::install($module_name);
module::activate($module_name);
module::install($module->name);
module::activate($module->name);
}
// Trigger late-binding install actions (defined in gallery_event::user_login)