- removing some non necessary path bits

12 files changed, 16 insertions, 18 deletions

diff --git a/core/Common.php b/core/Common.php
index 0b4a46d252..b8805f8b88 100644
--- a/core/Common.php
+++ b/core/Common.php
@@ -364,7 +364,7 @@ class Piwik_Common
 	static public function getOs($userAgent)
 	{
 
-		require_once "core/DataFiles/OS.php";
+		require_once "DataFiles/OS.php";
 		$osNameToId = $GLOBALS['Piwik_Oslist'];
 
 		foreach($osNameToId as $key => $value)
@@ -391,7 +391,7 @@ class Piwik_Common
 	 */
 	static public function getBrowserInfo($userAgent)
 	{
-		require_once "core/DataFiles/Browsers.php";
+		require_once "DataFiles/Browsers.php";
 
 		$browsers = $GLOBALS['Piwik_BrowserList'];
 
@@ -520,7 +520,7 @@ class Piwik_Common
 	 */
 	static public function getContinent($country)
 	{
-		require_once "core/DataFiles/Countries.php";
+		require_once "DataFiles/Countries.php";
 
 		$countryList = $GLOBALS['Piwik_CountryList'];
 
@@ -599,7 +599,7 @@ class Piwik_Common
 		static $countriesList = null;
 		if(is_null($countriesList))
 		{
-			require_once "core/DataFiles/Countries.php";
+			require_once "DataFiles/Countries.php";
 			$countriesList = array_keys($GLOBALS['Piwik_CountryList']);
 		}
 		return $countriesList;
diff --git a/core/Controller.php b/core/Controller.php
index da40ffbae3..616949c9cb 100644
--- a/core/Controller.php
+++ b/core/Controller.php
@@ -46,14 +46,12 @@ abstract class Piwik_Controller
 		$aPluginName = explode('_', get_class($this));
 		$this->pluginName = $aPluginName[1];
 		$this->strDate = Piwik_Common::getRequestVar('date', 'yesterday','string');
-		
-		// the date looks like YYYY-MM-DD we can build it
 		try{
+			// the date looks like YYYY-MM-DD we can build it
 			$this->date = Piwik_Date::factory($this->strDate);
 			$this->strDate = $this->date->toString();
 		} catch(Exception $e){
 			// the date looks like YYYY-MM-DD,YYYY-MM-DD or other format
-			// case the date looks like a range
 			$this->date = null;
 		}
 	}
diff --git a/core/Tracker/Visit.php b/core/Tracker/Visit.php
index 3446183d8d..c2df90b57d 100644
--- a/core/Tracker/Visit.php
+++ b/core/Tracker/Visit.php
@@ -661,7 +661,7 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface
 		 * be counted as a search engines, but as a website referer from google.com (because the
 		 * keyword couldn't be found in the URL) 
 		 */
-		require_once "core/DataFiles/SearchEngines.php";
+		require_once "DataFiles/SearchEngines.php";
 		
 		if(array_key_exists($this->refererHost, $GLOBALS['Piwik_SearchEngines']))
 		{
diff --git a/piwik.php b/piwik.php
index 455d0ac4e1..413ef7d147 100644
--- a/piwik.php
+++ b/piwik.php
@@ -12,9 +12,9 @@ define('PIWIK_INCLUDE_PATH', '.');
 @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 . PIWIK_INCLUDE_PATH . '/core'
 					. PATH_SEPARATOR . get_include_path() );
 
 require_once "Common.php";
diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php
index 1db5a2940b..34a3046512 100644
--- a/plugins/Installation/FormDatabaseSetup.php
+++ b/plugins/Installation/FormDatabaseSetup.php
@@ -9,7 +9,7 @@
  * @package Piwik_Installation
  */
 
-require_once "core/Form.php";
+require_once "Form.php";
 
 /**
  * 
diff --git a/plugins/Installation/FormFirstWebsiteSetup.php b/plugins/Installation/FormFirstWebsiteSetup.php
index 2bc85c12e3..036dc1b12d 100644
--- a/plugins/Installation/FormFirstWebsiteSetup.php
+++ b/plugins/Installation/FormFirstWebsiteSetup.php
@@ -9,7 +9,7 @@
  * @package Piwik_Installation
  */
 
-require_once "core/Form.php";
+require_once "Form.php";
 
 /**
  * 
diff --git a/plugins/Installation/FormGeneralSetup.php b/plugins/Installation/FormGeneralSetup.php
index 3bc5c72c76..87aeb053d6 100644
--- a/plugins/Installation/FormGeneralSetup.php
+++ b/plugins/Installation/FormGeneralSetup.php
@@ -9,7 +9,7 @@
  * @package Piwik_Installation
  */
 
-require_once "core/Form.php";
+require_once "Form.php";
 
 /**
  * 
diff --git a/plugins/Login/Form.php b/plugins/Login/Form.php
index 574ca476f2..0a6e652e16 100644
--- a/plugins/Login/Form.php
+++ b/plugins/Login/Form.php
@@ -9,7 +9,7 @@
  * @package Piwik_Login
  */
 
-require_once "core/Form.php";
+require_once "Form.php";
 
 /**
  * 
diff --git a/plugins/Login/PasswordForm.php b/plugins/Login/PasswordForm.php
index bf3d95fb1b..6df1bc51c1 100644
--- a/plugins/Login/PasswordForm.php
+++ b/plugins/Login/PasswordForm.php
@@ -9,7 +9,7 @@
  * @package Piwik_Login
  */
 
-require_once "core/Form.php";
+require_once "Form.php";
 
 /**
  * 
diff --git a/plugins/Referers/functions.php b/plugins/Referers/functions.php
index 70aea03d81..43a4d3eebc 100644
--- a/plugins/Referers/functions.php
+++ b/plugins/Referers/functions.php
@@ -23,7 +23,7 @@ function Piwik_truncatePath( $path )
 
 function Piwik_getSearchEngineUrlFromName($name)
 {
-	require_once "core/DataFiles/SearchEngines.php";
+	require_once "DataFiles/SearchEngines.php";
 	if(isset($GLOBALS['Piwik_SearchEngines_NameToUrl'][$name]))
 	{
 		$url = 'http://'.$GLOBALS['Piwik_SearchEngines_NameToUrl'][$name];
@@ -38,7 +38,7 @@ function Piwik_getSearchEngineUrlFromName($name)
 
 function Piwik_getSearchEngineLogoFromName($url)
 {
-	require_once "core/DataFiles/SearchEngines.php";
+	require_once "DataFiles/SearchEngines.php";
 	$path = 'plugins/Referers/images/searchEngines/%s.png';
 	$beginningUrl = strpos($url,'//') + 2;
 	$normalPath = sprintf($path, substr($url,$beginningUrl));
diff --git a/tests/core/Url.test.php b/tests/core/Url.test.php
index 44b2621876..b0fbaff02a 100644
--- a/tests/core/Url.test.php
+++ b/tests/core/Url.test.php
@@ -7,7 +7,7 @@ if(!defined('CONFIG_TEST_INCLUDED'))
 	require_once PATH_TEST_TO_ROOT . "/tests/config_test.php";
 }
 
-require_once "core/Url.php";
+require_once "Url.php";
 
 class Test_Piwik_Url extends UnitTestCase
 {
diff --git a/tests/core/UsersManager.test.php b/tests/core/UsersManager.test.php
index 1ee770731d..193a585828 100644
--- a/tests/core/UsersManager.test.php
+++ b/tests/core/UsersManager.test.php
@@ -10,7 +10,7 @@ require_once "Database.test.php";
 
 
 require 'UsersManager/API.php';
-require_once 'core/Site.php';
+require_once 'Site.php';
 
 class Test_Piwik_UsersManager extends Test_Database
 {