From bf444e84e84c6ba64db3b13266f4e95db6c45b7b Mon Sep 17 00:00:00 2001
From: mMarinetti <michael.marinetti@prestashop.com>
Date: Thu, 27 Oct 2011 18:53:06 +0000
Subject: [PATCH]  // fix installer

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9696 b9a71923-0436-4b27-9f14-aed3839534dd
---
 classes/ConfigurationTest.php      | 6 ++----
 config/defines.inc.php             | 4 ++--
 install-dev/model.php              | 1 +
 install-dev/xml/checkShopInfos.php | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/classes/ConfigurationTest.php b/classes/ConfigurationTest.php
index abeff76e8..3c74ba469 100644
--- a/classes/ConfigurationTest.php
+++ b/classes/ConfigurationTest.php
@@ -161,8 +161,7 @@ class ConfigurationTestCore
 
 	public static function test_dir($relative_dir, $recursive = false)
 	{
-		$root_dir = dirname(dirname(__FILE__)); // @TODO FIXME
-		$dir = $root_dir.DIRECTORY_SEPARATOR.ltrim($relative_dir, '/');
+		$dir = _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.ltrim($relative_dir, '/');
 		if (!file_exists($dir) OR !$dh = opendir($dir))
 			return false;
 		$dummy = rtrim($dir, '/').'/'.uniqid();
@@ -187,8 +186,7 @@ class ConfigurationTestCore
 
 	public static function test_file($file_relative)
 	{
-		$root_dir = dirname(dirname(__FILE__)); // @TODO FIXME
-		$file = $root_dir.DIRECTORY_SEPARATOR.$file_relative;
+		$file = _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.$file_relative;
 		return (file_exists($file) AND is_writable($file));
 	}
 
diff --git a/config/defines.inc.php b/config/defines.inc.php
index af9e70744..9bd3e6598 100755
--- a/config/defines.inc.php
+++ b/config/defines.inc.php
@@ -130,10 +130,10 @@ define('_PS_GEOLOCATION_NO_ORDER_', 1);
 define('MIN_PASSWD_LENGTH', 8);
 
 if (!defined('_PS_CACHE_ENABLED_'))
-    define('_PS_CACHE_ENABLED_', 0);
+	define('_PS_CACHE_ENABLED_', 0);
 
 define('_PS_SMARTY_NO_COMPILE_', 0);
 define('_PS_SMARTY_CHECK_COMPILE_', 1);
 define('_PS_SMARTY_FORCE_COMPILE_', 2);
 
-define('_PS_JQUERY_VERSION_', '1.4.4');
\ No newline at end of file
+define('_PS_JQUERY_VERSION_', '1.4.4');
diff --git a/install-dev/model.php b/install-dev/model.php
index 588c82693..4bab61cf6 100644
--- a/install-dev/model.php
+++ b/install-dev/model.php
@@ -86,6 +86,7 @@ if (isset($_GET['method']))
 	switch ($_GET['method'])
 	{
 		case 'checkConfig' :
+			define('_PS_ROOT_DIR_', realpath(INSTALL_PATH.'/../'));
 			require_once('xml/checkConfig.php');
 		break;
 
diff --git a/install-dev/xml/checkShopInfos.php b/install-dev/xml/checkShopInfos.php
index 06954ca02..a15094976 100644
--- a/install-dev/xml/checkShopInfos.php
+++ b/install-dev/xml/checkShopInfos.php
@@ -205,8 +205,8 @@ if (isFormValid())
 	}
 	Language::loadLanguages();
 	Configuration::loadConfiguration();
-	require_once(dirname(__FILE__).'/../../config/defines.inc.php');
-	require_once(dirname(__FILE__).'/../../classes/LocalizationPack.php');
+	require_once(DEFINES_FILE);
+	require_once(INSTALL_PATH.'/../classes/LocalizationPack.php');
 
 
 	$stream_context = @stream_context_create(array('http' => array('timeout' => 5)));