From b62427c0a63af3aa044def75d1f6ead088fbe74b Mon Sep 17 00:00:00 2001 From: Woody Gilk Date: Sun, 14 Dec 2008 16:45:14 -0600 Subject: [PATCH] Updated Kohana::modules to fix 9c4f0ef956806059d79bb22eefb9f500b02a07e0 --- system/classes/kohana.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/system/classes/kohana.php b/system/classes/kohana.php index 256ca29..66ea29a 100644 --- a/system/classes/kohana.php +++ b/system/classes/kohana.php @@ -336,12 +336,12 @@ final class Kohana { * @param array module paths * @return void */ - public static function modules(array $modules = NULL) + public static function modules($modules = NULL) { if ($modules === NULL) - return $modules; + return self::$modules; - // Start a new set of include paths, APPPATH first + // Start a new list of include paths, APPPATH first $include_paths = array(APPPATH); foreach ($modules as $name => $path) @@ -362,18 +362,19 @@ final class Kohana { } else { + // This module is invalid, remove it unset($modules[$name]); } } - // Set the current module list - self::$modules = $modules; - // Finish the include paths by adding SYSPATH $include_paths[] = SYSPATH; // Set the new include paths self::$include_paths = $include_paths; + + // Set the current module list + return self::$modules = $modules; } /**