From 7cbca147ccca8f7c2c63a176d3d1ecad6e6dd3bb Mon Sep 17 00:00:00 2001 From: Lee Wei Zhang Date: Mon, 26 Oct 2020 19:52:40 +0800 Subject: [PATCH 1/3] Replace slash with PHP constant Signed-off-by: Lee Wei Zhang --- libraries/vendor_config.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php index 665e619eb7..5855b97a0d 100644 --- a/libraries/vendor_config.php +++ b/libraries/vendor_config.php @@ -24,7 +24,7 @@ define('AUTOLOAD_FILE', ROOT_PATH . 'vendor/autoload.php'); /** * Directory where cache files are stored. */ -define('TEMP_DIR', ROOT_PATH . 'tmp/'); +define('TEMP_DIR', ROOT_PATH . 'tmp' . DIRECTORY_SEPARATOR); /** * Path to changelog file, can be gzip compressed. Useful when you want to @@ -41,7 +41,7 @@ define('LICENSE_FILE', ROOT_PATH . 'LICENSE'); /** * Directory where SQL scripts to create/upgrade configuration storage reside. */ -define('SQL_DIR', ROOT_PATH . 'sql/'); +define('SQL_DIR', ROOT_PATH . 'sql' . DIRECTORY_SEPARATOR); /** * Directory where configuration files are stored. @@ -73,9 +73,9 @@ define('VERSION_CHECK_DEFAULT', true); /** * Path to files with compiled locales (*.mo) */ -define('LOCALE_PATH', ROOT_PATH . 'locale/'); +define('LOCALE_PATH', ROOT_PATH . 'locale' . DIRECTORY_SEPARATOR); /** * Define the cache directory for routing cache an other cache files */ -define('CACHE_DIR', ROOT_PATH . 'libraries/cache/'); +define('CACHE_DIR', ROOT_PATH . 'libraries/cache' . DIRECTORY_SEPARATOR); From e36dd797bf1a5aa2d6fe797b3e2b0dc5e8a6202d Mon Sep 17 00:00:00 2001 From: Wei Zhang Date: Tue, 27 Oct 2020 10:38:59 +0800 Subject: [PATCH 2/3] Replace slash with PHP constant Signed-off-by: Lee Wei Zhang --- libraries/vendor_config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php index 5855b97a0d..adf8811996 100644 --- a/libraries/vendor_config.php +++ b/libraries/vendor_config.php @@ -78,4 +78,4 @@ define('LOCALE_PATH', ROOT_PATH . 'locale' . DIRECTORY_SEPARATOR); /** * Define the cache directory for routing cache an other cache files */ -define('CACHE_DIR', ROOT_PATH . 'libraries/cache' . DIRECTORY_SEPARATOR); +define('CACHE_DIR', ROOT_PATH . 'libraries' . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR); From b170b85fdaffaaec0963a89cf79f3beaa1b74ea4 Mon Sep 17 00:00:00 2001 From: Niko Halink Date: Sun, 1 Nov 2020 00:31:17 +0100 Subject: [PATCH 3/3] Replace / with DIRECTORY_SEPARATOR Signed-off-by: Niko Halink --- libraries/config.default.php | 2 +- libraries/vendor_config.php | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/config.default.php b/libraries/config.default.php index 2ee0c71a9b..6d4121e8b1 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -2748,7 +2748,7 @@ $cfg['SaveDir'] = ''; if (defined('TEMP_DIR')) { $cfg['TempDir'] = TEMP_DIR; } else { - $cfg['TempDir'] = ROOT_PATH . 'tmp/'; + $cfg['TempDir'] = ROOT_PATH . 'tmp' . DIRECTORY_SEPARATOR; } diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php index 665e619eb7..71c7aeea1e 100644 --- a/libraries/vendor_config.php +++ b/libraries/vendor_config.php @@ -19,12 +19,12 @@ if (! defined('PHPMYADMIN')) { * Path to vendor autoload file. Useful when you want to * have have vendor dependencies somewhere else. */ -define('AUTOLOAD_FILE', ROOT_PATH . 'vendor/autoload.php'); +define('AUTOLOAD_FILE', ROOT_PATH . 'vendor'. DIRECTORY_SEPARATOR .'autoload.php'); /** * Directory where cache files are stored. */ -define('TEMP_DIR', ROOT_PATH . 'tmp/'); +define('TEMP_DIR', ROOT_PATH . 'tmp' . DIRECTORY_SEPARATOR); /** * Path to changelog file, can be gzip compressed. Useful when you want to @@ -41,7 +41,7 @@ define('LICENSE_FILE', ROOT_PATH . 'LICENSE'); /** * Directory where SQL scripts to create/upgrade configuration storage reside. */ -define('SQL_DIR', ROOT_PATH . 'sql/'); +define('SQL_DIR', ROOT_PATH . 'sql' . DIRECTORY_SEPARATOR); /** * Directory where configuration files are stored. @@ -73,9 +73,9 @@ define('VERSION_CHECK_DEFAULT', true); /** * Path to files with compiled locales (*.mo) */ -define('LOCALE_PATH', ROOT_PATH . 'locale/'); +define('LOCALE_PATH', ROOT_PATH . 'locale' . DIRECTORY_SEPARATOR); /** * Define the cache directory for routing cache an other cache files */ -define('CACHE_DIR', ROOT_PATH . 'libraries/cache/'); +define('CACHE_DIR', ROOT_PATH . 'libraries'. DIRECTORY_SEPARATOR .'cache' . DIRECTORY_SEPARATOR);