The branch, master has been updated via 60dad887b00398be8821196b8c397ec06a21082d (commit) from 8c6e88002232949f539b989b73cb97a6e5ff3eca (commit)

- Log ----------------------------------------------------------------- commit 60dad887b00398be8821196b8c397ec06a21082d Author: Michal Čihař mcihar@suse.cz Date: Wed Jun 22 13:23:35 2011 +0200

Fix condition for mcrypt warning

-----------------------------------------------------------------------

Summary of changes: main.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/main.php b/main.php index fecb0d7..f340e80 100644 --- a/main.php +++ b/main.php @@ -344,7 +344,7 @@ if ($cfg['SuhosinDisableWarning'] == false && @ini_get('suhosin.request.max_valu /** * Warning about mcrypt. */ -if (!$GLOBALS['cfg']['McryptDisableWarning']) { +if (!function_exists('mcrypt_encrypt') && !$GLOBALS['cfg']['McryptDisableWarning']) { PMA_warnMissingExtension('mcrypt'); }

hooks/post-receive