From b3a1a0c1f0edb438b3f1df12d09620180e18b4bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 12 Feb 2016 11:13:07 +0100 Subject: [PATCH] Use PATH_SEPARATOR for determining path separator MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes error on servers with disabled php_uname Fixes #11944 Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/php-gettext/gettext.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d8c5843741..2e69ec29bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,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 diff --git a/libraries/php-gettext/gettext.inc b/libraries/php-gettext/gettext.inc index 74e0be9940..75e2112182 100644 --- a/libraries/php-gettext/gettext.inc +++ b/libraries/php-gettext/gettext.inc @@ -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 {