Merge branch 'QA_4_6'

This commit is contained in:
Michal Čihař 2016-02-12 11:14:04 +01:00
commit 20063dec22
2 changed files with 2 additions and 1 deletions

View File

@ -68,6 +68,7 @@ phpMyAdmin - ChangeLog
- issue #11911 Inserts via tbl_change.php in VARBINARY columns does not allow using HEX() and MD5()
- issue #11939 Correct content type for uploaded error reports
- issue #11940 Silent errors from checking local documentation
- issue #11944 Fixed error on servers with disabled php_uname
4.5.4.1 (2016-01-29)
- issue #11892 Error with PMA 4.4.15.3

View File

@ -244,7 +244,7 @@ function _setlocale($category, $locale) {
function _bindtextdomain($domain, $path) {
global $text_domains;
// ensure $path ends with a slash ('/' should work for both, but lets still play nice)
if (substr(php_uname(), 0, 7) == "Windows") {
if (PATH_SEPARATOR == '\\') {
if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
$path .= '\\';
} else {