Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1

2014-01-24 16:54:23 +01:00 · 2014-01-24 16:54:23 +01:00 · 5fa80f6f33
commit 5fa80f6f33
parent 6461650589 2d9013379c
2 changed files with 3 additions and 0 deletions
--- a/2
+++ b/2
@ -9,6 +9,8 @@ phpMyAdmin - ChangeLog
 - bug #4218 Chrome behavior with date fields
 - bug #3579 NOW() function incorrectly selected (regression)
 - bug #4244 Advisor complaints about MariaDB 10.x is version less than 5.1
+- bug #3889 When login fails and error display is active, login data is
+displayed (regression)

 4.1.5.0 (2014-01-17)
 - bug #3780 Allow aborting loading pages
--- a/libraries/Error.class.php
+++ b/libraries/Error.class.php
@ -311,6 +311,7 @@ class PMA_Error extends PMA_Message
            'mysqli_connect',
            'mysqli_real_connect',
            'connect',
+            '_realConnect'
        );

        if (in_array($function, $include_functions)) {