gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #16447 and #16436 - Fix #16430 - Windows error message uses trailing / instead of \

Browse Source 
Fixes: #16430
Pull-request: #16447
Pull-request: #16430
This is a merge octopus because the contributions where similar and complementary.

Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2020-11-01 21:42:07 +01:00
commit 17bb124217
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/config.default.php
View File

@ -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;
}

10
libraries/vendor_config.php
View File

@ -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);