From 01eaffcd1c8f3c0c309ef33ca8381d8cbfeca763 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Fri, 29 Mar 2013 15:21:49 +0100 Subject: [PATCH] [-] INSTALLER : Fix bug, can not check rights on theme folders --- classes/ConfigurationTest.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/classes/ConfigurationTest.php b/classes/ConfigurationTest.php index c8a070fee..322d7f4a8 100644 --- a/classes/ConfigurationTest.php +++ b/classes/ConfigurationTest.php @@ -55,9 +55,9 @@ class ConfigurationTestCore 'img_dir' => 'img', 'mails_dir' => 'mails', 'module_dir' => 'modules', - 'theme_lang_dir' => 'themes/'._THEME_NAME_.'/lang', + 'theme_lang_dir' => 'themes/'._THEME_NAME_.'/lang/', 'theme_pdf_lang_dir' => 'themes/'._THEME_NAME_.'/pdf/lang/', - 'theme_cache_dir' => 'themes/'._THEME_NAME_.'/cache', + 'theme_cache_dir' => 'themes/'._THEME_NAME_.'/cache/', 'translations_dir' => 'translations', 'customizable_products_dir' => 'upload', 'virtual_products_dir' => 'download' @@ -267,21 +267,24 @@ class ConfigurationTestCore public static function test_theme_lang_dir($dir) { - if (!file_exists($dir)) - return true; + $absoluteDir = rtrim(_PS_ROOT_DIR_, '\\/').DIRECTORY_SEPARATOR.trim($dir, '\\/'); + if (!file_exists($absoluteDir)) + return true; return ConfigurationTest::test_dir($dir, true); } public static function test_theme_pdf_lang_dir($dir) { - if (!file_exists($dir)) + $absoluteDir = rtrim(_PS_ROOT_DIR_, '\\/').DIRECTORY_SEPARATOR.trim($dir, '\\/'); + if (!file_exists($absoluteDir)) return true; return ConfigurationTest::test_dir($dir, true); } public static function test_theme_cache_dir($dir) { - if (!file_exists($dir)) + $absoluteDir = rtrim(_PS_ROOT_DIR_, '\\/').DIRECTORY_SEPARATOR.trim($dir, '\\/'); + if (!file_exists($absoluteDir)) return true; return ConfigurationTest::test_dir($dir, true); }