refs #783 - more include (search) path changes to handle either (but not both)...

refs #783 - more include (search) path changes to handle either (but not both) disabled ini_set() or set_include(); also avoid "[apc-error] Cannot redeclare class piwik_version"


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

index.php

@@ -28,11 +28,13 @@ if(!defined('PIWIK_INCLUDE_PATH'))
 }
 define('PIWIK_DOCUMENT_ROOT', dirname(__FILE__));
 
-if((@include "Version.php") === false || !class_exists('Piwik_Version', false))
+if(!defined('PIWIK_INCLUDE_SEARCH_PATH'))
 {
-	ini_set('include_path', PIWIK_INCLUDE_PATH . '/core'
-	     . PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/libs'
-	     . PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/plugins');
+	define('PIWIK_INCLUDE_SEARCH_PATH', PIWIK_INCLUDE_PATH . '/core'
+		. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/libs'
+		. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/plugins');
+	@ini_set('include_path', PIWIK_INCLUDE_SEARCH_PATH);
+	@set_include_path(PIWIK_INCLUDE_SEARCH_PATH);
 }
 
 require_once PIWIK_INCLUDE_PATH . '/core/testMinimumPhpVersion.php';

misc/generateVisits.php

@@ -24,10 +24,13 @@ if(!defined('PIWIK_INCLUDE_PATH'))
 ignore_user_abort(true);
 set_time_limit(0);
 
-if((@include "Version.php") === false || !class_exists('Piwik_Version', false)) {
-	ini_set('include_path', PIWIK_INCLUDE_PATH . '/core'
-	     . PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/libs'
-	     . PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/plugins');
+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');
+	@ini_set('include_path', PIWIK_INCLUDE_SEARCH_PATH);
+	@set_include_path(PIWIK_INCLUDE_SEARCH_PATH);
 }
 
 $GLOBALS['PIWIK_TRACKER_DEBUG'] = false;

piwik.php

@@ -23,11 +23,13 @@ if(!defined('PIWIK_INCLUDE_PATH'))
 
 @ignore_user_abort(true);
 
-if((@include "Version.php") === false || !class_exists('Piwik_Version', false))
+if(!defined('PIWIK_INCLUDE_SEARCH_PATH'))
 {
-	ini_set('include_path', PIWIK_INCLUDE_PATH . '/core'
-	     . PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/libs'
-	     . PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/plugins');
+	define('PIWIK_INCLUDE_SEARCH_PATH', PIWIK_INCLUDE_PATH . '/core'
+		. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/libs'
+		. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/plugins');
+	@ini_set('include_path', PIWIK_INCLUDE_SEARCH_PATH);
+	@set_include_path(PIWIK_INCLUDE_SEARCH_PATH);
 }
 
 require_once PIWIK_INCLUDE_PATH .'/libs/Event/Dispatcher.php';

tests/config_test.php

@@ -7,10 +7,14 @@ if(!defined('PIWIK_INCLUDE_PATH'))
 {
 	define('PIWIK_INCLUDE_PATH', PIWIK_PATH_TEST_TO_ROOT);
 }
-
-ini_set('include_path', PIWIK_INCLUDE_PATH . '/core'
-     . PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/libs'
-     . PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/plugins');
+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');
+}
+@ini_set('include_path', PIWIK_INCLUDE_SEARCH_PATH);
+@set_include_path(PIWIK_INCLUDE_SEARCH_PATH);
 
 require_once 'Loader.php';