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

// Fix bug on install

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9648 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie committed 2011-10-25 20:31:23 +00:00
1 parent 4fd262bd68
commit e5b32b6666
2 files changed
+4 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

classes/ConfigurationTest.php
+4 -2
View File
@@ -161,7 +161,8 @@ class ConfigurationTestCore
public static function test_dir($relative_dir, $recursive = false) public static function test_dir($relative_dir, $recursive = false)
{ {
$dir = _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.ltrim($relative_dir, '/'); $root_dir = dirname(dirname(__FILE__)); // @TODO FIXME
$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();
@@ -186,7 +187,8 @@ class ConfigurationTestCore
public static function test_file($file_relative) public static function test_file($file_relative)
{ {
$file = _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.$file_relative; $root_dir = dirname(dirname(__FILE__)); // @TODO FIXME
$file = $root_dir.DIRECTORY_SEPARATOR.$file_relative;
return (file_exists($file) AND is_writable($file)); return (file_exists($file) AND is_writable($file));
} }
install-dev/model.php
-1
View File
@@ -74,7 +74,6 @@ define('INSTALLER__PS_BASE_URI_ABSOLUTE', 'http://'.ToolsInstall::getHttpHost(fa
// XML Header // XML Header
header('Content-Type: text/xml'); header('Content-Type: text/xml');
define('_PS_ROOT_DIR_', realpath(INSTALL_PATH.'/../'));
// Switching method // Switching method
if (isset($_GET['method'])) if (isset($_GET['method']))
{ {