Kohana v3.3.5

2016-05-01 20:50:24 +10:00
parent 8888719653
commit 68c7f4f159
170 changed files with 4565 additions and 1176 deletions
--- a/modules/unittest/bootstrap.php
+++ b/modules/unittest/bootstrap.php
@@ -121,5 +121,10 @@ if (($ob_len = ob_get_length()) !== FALSE)
 	}
 }

-// Enable the unittest module
-Kohana::modules(Kohana::modules() + array('unittest' => MODPATH.'unittest'));
+// Enable the unittest module if it is not already loaded - use the absolute path
+$modules = Kohana::modules();
+$unittest_path = realpath(__DIR__).DIRECTORY_SEPARATOR;
+if ( ! in_array($unittest_path, $modules)) {
+	$modules['unittest'] = $unittest_path;
+	Kohana::modules($modules);
+}