diff --git a/ChangeLog b/ChangeLog index 29244cb2c..7cfa36566 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA thanks to Samuel L. B. - samuellb - patch #1895796 [lang] Typo in Japanese lang files, thanks to tyman - acoustype +- bug #1935652 [auth] Access denied (show warning about mcrypt on login page) 2.11.5.1 (2008-03-29) - bug #1909711 [security] Sensitive data in session files diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index 7d3452107..3746fe0e5 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -258,6 +258,12 @@ if (top != self) { echo '
' . $error . '
' . "\n"; } } + // the warning is also displayed on main page but show it also here, + // because on some PHP versions running on 64-bit, the blowfish library + // does not work and this would prevent login + if (defined('PMA_WARN_FOR_MCRYPT')) { + echo '
' . PMA_sanitize(sprintf($GLOBALS['strCantLoad'], 'mcrypt')) . '
' . "\n"; + } ?>