fixes #631 - make set_include_path() conditional on presence of

Zend/Version.php


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

index.php

@@ -19,11 +19,13 @@ if(!defined('PIWIK_INCLUDE_PATH'))
 	define('PIWIK_INCLUDE_PATH', dirname(__FILE__));
 }
 
-set_include_path(PIWIK_INCLUDE_PATH 
-					. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/libs/'
-					. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/plugins/'
-					. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/core/'
-					. PATH_SEPARATOR . get_include_path());
+if((@include "Zend/Version.php") === false) {
+	set_include_path(PIWIK_INCLUDE_PATH
+		. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/core'
+		. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/libs'
+		. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/plugins'
+		. PATH_SEPARATOR . get_include_path());
+}
  
 require_once "core/testMinimumPhpVersion.php";
 

piwik.php

@@ -18,11 +18,13 @@ error_reporting(E_ALL|E_NOTICE);
 define('PIWIK_INCLUDE_PATH', dirname(__FILE__));
 @ignore_user_abort(true);
 
-set_include_path(PIWIK_INCLUDE_PATH 
-					. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/core'
-					. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/libs/'
-					. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/plugins/'
-					. PATH_SEPARATOR . get_include_path() );
+if((@include "Zend/Version.php") === false) {
+	set_include_path(PIWIK_INCLUDE_PATH
+		. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/core'
+		. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/libs'
+		. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/plugins'
+		. PATH_SEPARATOR . get_include_path());
+}
 
 require_once "Common.php";
 require_once "PluginsManager.php";