From e8da9ee1a6775d4604343d2201802f7ec082af88 Mon Sep 17 00:00:00 2001
From: robocoder <anthon.pang@gmail.com>
Date: Wed, 29 Jul 2009 00:16:42 +0000
Subject: [PATCH] refs #886, #656, #8585 - add PIWIK_DOCUMENT_ROOT and optional
inclusion of bootstrap.php
git-svn-id: http://dev.piwik.org/svn/trunk@1341 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
index.php | 5 +++++
piwik.php | 6 ++++++
2 files changed, 11 insertions(+)
diff --git a/index.php b/index.php
index e5c2554914..1a9d9603ee 100644
--- a/index.php
+++ b/index.php
@@ -18,9 +18,14 @@ if(ini_get('session.save_handler') == 'user')
@ini_set('session.save_path', '');
}
+define('PIWIK_DOCUMENT_ROOT', dirname(__FILE__));
if(!defined('PIWIK_INCLUDE_PATH'))
{
define('PIWIK_INCLUDE_PATH', dirname(__FILE__));
+ if(file_exists(PIWIK_INCLUDE_PATH . '/bootstrap.php'))
+ {
+ require_once PIWIK_INCLUDE_PATH . '/bootstrap.php';
+ }
}
if((@include "Version.php") === false || !class_exists('Piwik_Version', false))
diff --git a/piwik.php b/piwik.php
index c9386a0ed3..fe64750728 100644
--- a/piwik.php
+++ b/piwik.php
@@ -11,10 +11,16 @@ $GLOBALS['PIWIK_TRACKER_DEBUG'] = false;
define('PIWIK_TRACKER_MODE', true);
error_reporting(E_ALL|E_NOTICE);
+
if(!defined('PIWIK_INCLUDE_PATH'))
{
define('PIWIK_INCLUDE_PATH', dirname(__FILE__));
+ if(file_exists(PIWIK_INCLUDE_PATH . '/bootstrap.php'))
+ {
+ require_once PIWIK_INCLUDE_PATH . '/bootstrap.php';
+ }
}
+
@ignore_user_abort(true);
if((@include "Version.php") === false || !class_exists('Piwik_Version', false))
--
GitLab