1 files changed, 34 insertions, 2 deletions

diff --git a/index.php b/index.php
index 07c2ebc0de..3d14f533a5 100644
--- a/index.php
+++ b/index.php
@@ -31,17 +31,49 @@ if(!defined('PIWIK_INCLUDE_PATH'))
 	define('PIWIK_INCLUDE_PATH', PIWIK_DOCUMENT_ROOT);
 }
 
+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);
+}
+
+if(!defined('PIWIK_SESSION_NAME'))
+{
+	define('PIWIK_SESSION_NAME', 'PIWIK_SESSID');
+}
+@ini_set('session.name', PIWIK_SESSION_NAME);
+if(ini_get('session.save_handler') == 'user')
+{
+	@ini_set('session.save_handler', 'files');
+	@ini_set('session.save_path', '');
+}
+if(ini_get('session.save_handler') == 'files')
+{
+	if(ini_get('safe_mode') || ini_get('open_basedir') || !@is_writable(ini_get('session.save_path')))
+	{
+		$sessionPath = PIWIK_USER_PATH . '/tmp/sessions';
+		@ini_set('session.save_path', $sessionPath);
+		if(!is_dir($sessionPath))
+		{
+			@mkdir($sessionPath, 0755, true);
+		}
+	}
+}
+
 require_once PIWIK_INCLUDE_PATH . '/core/testMinimumPhpVersion.php';
 
 // NOTE: the code above this comment must be PHP4 compatible
 
 session_cache_limiter('nocache');
-@date_default_timezone_set('UTC');
+@date_default_timezone_set(date_default_timezone_get());
 require_once PIWIK_INCLUDE_PATH .'/core/Loader.php';
 
 if(!defined('PIWIK_ENABLE_SESSION_START') || PIWIK_ENABLE_SESSION_START)
 {
-	Piwik_Session::start();
+	Zend_Session::start();
 }
 
 if(!defined('PIWIK_ENABLE_ERROR_HANDLER') || PIWIK_ENABLE_ERROR_HANDLER)