Fixes #783 - don't append preset include path; thanks feyp.

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

core/View.php

@@ -44,7 +44,10 @@ class Piwik_View implements Piwik_iView
 		array_walk($this->smarty->plugins_dir, array("Piwik_View","addPiwikPath"));
 
 		$this->smarty->compile_dir = $smConf->compile_dir;
+		Piwik_View::addPiwikPath($this->smarty->compile_dir, null);
+
 		$this->smarty->cache_dir = $smConf->cache_dir;
+		Piwik_View::addPiwikPath($this->smarty->cache_dir, null);
 
 		$this->smarty->error_reporting = $smConf->debugging;
 		$this->smarty->error_reporting = $smConf->error_reporting;

index.php

@@ -22,8 +22,7 @@ if(!defined('PIWIK_INCLUDE_PATH'))
 if((@include "Version.php") === false || !class_exists('Piwik_Version')) {
 	set_include_path(PIWIK_INCLUDE_PATH . '/core'
 		. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/libs'
-		. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/plugins'
-		. PATH_SEPARATOR . get_include_path());
+		. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/plugins');
 }
  
 require_once "core/testMinimumPhpVersion.php";

piwik.php

@@ -21,8 +21,7 @@ define('PIWIK_INCLUDE_PATH', dirname(__FILE__));
 if((@include "Version.php") === false || !class_exists('Piwik_Version')) {
 	set_include_path(PIWIK_INCLUDE_PATH . '/core'
 		. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/libs'
-		. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/plugins'
-		. PATH_SEPARATOR . get_include_path());
+		. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/plugins');
 }
 
 require_once "Common.php";