dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// fix installer

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9696 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mMarinetti
2011-10-27 18:53:06 +00:00
parent 5f79d9f879
commit bf444e84e8
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/ConfigurationTest.php
+2 -4
View File
@@ -161,8 +161,7 @@ class ConfigurationTestCore
public static function test_dir($relative_dir, $recursive = false) public static function test_dir($relative_dir, $recursive = false)
{ {
$root_dir = dirname(dirname(__FILE__)); // @TODO FIXME $dir = _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.ltrim($relative_dir, '/');
$dir = $root_dir.DIRECTORY_SEPARATOR.ltrim($relative_dir, '/');
if (!file_exists($dir) OR !$dh = opendir($dir)) if (!file_exists($dir) OR !$dh = opendir($dir))
return false; return false;
$dummy = rtrim($dir, '/').'/'.uniqid(); $dummy = rtrim($dir, '/').'/'.uniqid();
@@ -187,8 +186,7 @@ class ConfigurationTestCore
public static function test_file($file_relative) public static function test_file($file_relative)
{ {
$root_dir = dirname(dirname(__FILE__)); // @TODO FIXME $file = _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.$file_relative;
$file = $root_dir.DIRECTORY_SEPARATOR.$file_relative;
return (file_exists($file) AND is_writable($file)); return (file_exists($file) AND is_writable($file));
} }
config/defines.inc.php
+2 -2
View File
@@ -130,10 +130,10 @@ define('_PS_GEOLOCATION_NO_ORDER_', 1);
define('MIN_PASSWD_LENGTH', 8); define('MIN_PASSWD_LENGTH', 8);
if (!defined('_PS_CACHE_ENABLED_')) if (!defined('_PS_CACHE_ENABLED_'))
define('_PS_CACHE_ENABLED_', 0); define('_PS_CACHE_ENABLED_', 0);
define('_PS_SMARTY_NO_COMPILE_', 0); define('_PS_SMARTY_NO_COMPILE_', 0);
define('_PS_SMARTY_CHECK_COMPILE_', 1); define('_PS_SMARTY_CHECK_COMPILE_', 1);
define('_PS_SMARTY_FORCE_COMPILE_', 2); define('_PS_SMARTY_FORCE_COMPILE_', 2);
define('_PS_JQUERY_VERSION_', '1.4.4'); define('_PS_JQUERY_VERSION_', '1.4.4');
install-dev/model.php
+1
View File
@@ -86,6 +86,7 @@ if (isset($_GET['method']))
switch ($_GET['method']) switch ($_GET['method'])
{ {
case 'checkConfig' : case 'checkConfig' :
define('_PS_ROOT_DIR_', realpath(INSTALL_PATH.'/../'));
require_once('xml/checkConfig.php'); require_once('xml/checkConfig.php');
break; break;
install-dev/xml/checkShopInfos.php
+2 -2
View File
@@ -205,8 +205,8 @@ if (isFormValid())
} }
Language::loadLanguages(); Language::loadLanguages();
Configuration::loadConfiguration(); Configuration::loadConfiguration();
require_once(dirname(__FILE__).'/../../config/defines.inc.php'); require_once(DEFINES_FILE);
require_once(dirname(__FILE__).'/../../classes/LocalizationPack.php'); require_once(INSTALL_PATH.'/../classes/LocalizationPack.php');
$stream_context = @stream_context_create(array('http' => array('timeout' => 5))); $stream_context = @stream_context_create(array('http' => array('timeout' => 5)));