bug 1658160, warning about mcrypt

This commit is contained in:
Marc Delisle
2007-02-14 21:18:38 +00:00
parent 7842883542
commit fbfc003fdc
3 changed files with 9 additions and 0 deletions

View File

@@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog
$Id$ $Id$
$HeadURL$ $HeadURL$
2007-02-14 Marc Delisle <lem9@users.sourceforge.net>
* add a warning on main page if mcrypt can't be loaded (bug 1658160)
2007-02-12 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2007-02-12 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/database_interface.lib.php: bug #1616486 server_databases does * libraries/database_interface.lib.php: bug #1616486 server_databases does
not show all databases not show all databases

View File

@@ -22,6 +22,8 @@ if (function_exists('mcrypt_encrypt') || PMA_dl('mcrypt')) {
require_once './libraries/mcrypt.lib.php'; require_once './libraries/mcrypt.lib.php';
} else { } else {
require_once './libraries/blowfish.php'; require_once './libraries/blowfish.php';
// for main.php:
define('PMA_WARN_FOR_MCRYPT',1);
} }

View File

@@ -394,6 +394,10 @@ if (defined('PMA_MYSQL_INT_VERSION') && PMA_MYSQL_INT_VERSION < 32332) {
echo '<div class="warning">' . sprintf($strUpgrade, 'MySQL', '3.23.32') . '</div>' . "\n"; echo '<div class="warning">' . sprintf($strUpgrade, 'MySQL', '3.23.32') . '</div>' . "\n";
} }
if (defined('PMA_WARN_FOR_MCRYPT')) {
echo '<div class="warning">' . PMA_sanitize(sprintf($strCantLoad, 'mcrypt')) . '</div>' . "\n";
}
/** /**
* prints list item for main page * prints list item for main page
* *