diff --git a/ChangeLog b/ChangeLog index 9530ef4a28..e6c73b3f29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -112,6 +112,7 @@ phpMyAdmin - ChangeLog - issue #13088 Fixed editing of rows with text primary key - issue #13092 Do not try to sync favorite tables if configuration storage is not enabled - issue #13105 Fixed changing attribute for virtual field +- issue #12757 Fixed setting password on recent MariaDB with non working plugins 4.6.6 (2017-01-23) - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup' diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 454d70e8b1..b84c6b28ef 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -5048,10 +5048,15 @@ function PMA_checkIfMariaDBPwdCheckPluginActive() return false; } - $result = $GLOBALS['dbi']->query( + $result = $GLOBALS['dbi']->tryQuery( 'SHOW PLUGINS SONAME LIKE \'%_password_check%\'' ); + /* Plugins are not working, for example directory does not exists */ + if ($result === false) { + return false; + } + while ($row = $GLOBALS['dbi']->fetchAssoc($result)) { if ($row['Status'] === 'ACTIVE') { return true;