From cf6129df640cc329203892f0bdbfd383e179720f Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Mon, 5 Dec 2016 18:47:59 -0500 Subject: [PATCH 1/2] ChangeLog updated for 4.6.5.2 Signed-off-by: Isaac Bennetch --- ChangeLog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6681099b95..2666776b14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,13 +7,15 @@ phpMyAdmin - ChangeLog - issue #12762 Fixed parsing of SQL with BINARY function - issue #12588 ReCaptcha now works without allow_url_fopen - issue #12699 Show no local storage warning only on settings tab -- issue #12765 Fixed SQL export with newlines - issue #12778 Syntax Error in Adding/Changing TIMESTAMP columns with default value as NULL - issue #12769 Edit/Export links are not clickable under Routines tab - issue #12757 Fixed creating new user with older MariaDB - issue #12784 Remove ctype installation suggestion - issue #12780 Format button replaces all text with blank spaces +4.6.5.2 (2016-12-05) +- issue #12765 Fixed SQL export with newlines + 4.6.5.1 (2016-11-25) - issue #12735 Incorrect parameters to escapeString in Node.php - issue #12734 Fix PHP error when mbstring is not installed From ce714410ec320f5c50bdb733a8fc6c30d4bc9454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 6 Dec 2016 09:47:42 +0100 Subject: [PATCH 2/2] Use vendor specific path when loading gettext in tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- test/bootstrap-dist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php index 0188e49b05..74761d9021 100644 --- a/test/bootstrap-dist.php +++ b/test/bootstrap-dist.php @@ -65,7 +65,7 @@ unset($CFG); require_once 'libraries/sql-parser/autoload.php'; /* Ensure default langauge is active */ -require_once 'libraries/php-gettext/gettext.inc'; +require_once GETTEXT_INC; PMA\libraries\LanguageManager::getInstance()->getLanguage('en')->activate(); // Set proxy information from env, if available