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"

1 files changed, 6 insertions, 4 deletions

diff --git a/index.php b/index.php
index 16c64ff826..da5f81ebb8 100644
--- a/index.php
+++ b/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';