refs r2462

git-svn-id: http://dev.piwik.org/svn/trunk@2470 59fd770c-687e-43c8-a1e3-f5a4ff64c105

core/Loader.php

@@ -58,10 +58,6 @@ class Piwik_Loader
 			for($i = 0; $i < count(self::$dirs); $i++)
 			{
 				$path = PIWIK_INCLUDE_PATH . self::$dirs[$i] . $classPath . '.php';
-				if(strpos($path, '..') !== false)
-				{
-					continue;
-				}
 				if(file_exists($path))
 				{
 					require_once $path; // prefixed by PIWIK_INCLUDE_PATH

tests/config_test.php

@@ -16,7 +16,8 @@ if(!defined('PIWIK_INCLUDE_SEARCH_PATH'))
 	define('PIWIK_INCLUDE_SEARCH_PATH', PIWIK_INCLUDE_PATH . '/core'
 		. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/libs'
 		. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/plugins'
-		. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/tests/core');
+		. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/tests/core'
+		. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/tests/integration');
 }
 @ini_set('include_path', PIWIK_INCLUDE_SEARCH_PATH);
 @set_include_path(PIWIK_INCLUDE_SEARCH_PATH);