diff options
author | robocoder <anthon.pang@gmail.com> | 2009-08-02 22:54:21 +0400 |
---|---|---|
committer | robocoder <anthon.pang@gmail.com> | 2009-08-02 22:54:21 +0400 |
commit | 359dca5ef036b0de83780d4c12555ccf12f2de13 (patch) | |
tree | 28ef384830b14215a91ee377d67fea9e768df731 /index.php | |
parent | 788cfb83b6c1b37fa35b8daca735ad0041bd827c (diff) |
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
Diffstat (limited to 'index.php')
-rw-r--r-- | index.php | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -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'; |