Extending 8d6f80e to add some compatibility fixes and updated variabl…

…e names/comments for clarity

classes/kohana/core.php

@@ -522,11 +522,11 @@ public static function include_paths()
 	 * @param   string   directory name (views, i18n, classes, extensions, etc.)
 	 * @param   string   filename with subdirectory
 	 * @param   string   extension to search for
-	 * @param   boolean  flag that determines the return type
-	 * @return  array    file list from the directory
+	 * @param   boolean  return an array of files?
+	 * @return  array    a list of files when $array is TRUE
 	 * @return  string   single file path
 	 */
-	public static function find_file($dir, $file, $ext = NULL, $aggregate_files = FALSE)
+	public static function find_file($dir, $file, $ext = NULL, $array = FALSE)
 	{
 		// Use the defined extension by default
 		$ext = ($ext === NULL) ? EXT : '.'.$ext;
@@ -546,7 +546,7 @@ public static function find_file($dir, $file, $ext = NULL, $aggregate_files = FA
 			$benchmark = Profiler::start('Kohana', __FUNCTION__);
 		}
 
-		if ($aggregate_files OR $dir === 'config' OR $dir === 'i18n' OR $dir === 'messages')
+		if ($array OR $dir === 'config' OR $dir === 'i18n' OR $dir === 'messages')
 		{
 			// Include paths must be searched in reverse
 			$paths = array_reverse(Kohana::$_paths);

classes/kohana/i18n.php

@@ -77,7 +77,7 @@ public static function load($lang)
 			// Create a path for this set of parts
 			$path = implode(DIRECTORY_SEPARATOR, $parts);
 
-			if ($files = Kohana::find_file('i18n', $path))
+			if ($files = Kohana::find_file('i18n', $path, NULL, TRUE))
 			{
 				$t = array();
 				foreach ($files as $file)