nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #2414056 [auth] AllowNoPasswordRoot error message is too vague

Browse Source
This commit is contained in:
Marc Delisle
2009-02-10 18:15:18 +00:00
parent 1de1044939
commit 842ed504d2
58 changed files with 61 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/auth/cookie.auth.lib.php
View File

@@ -654,7 +654,9 @@ function PMA_auth_fails()
// Deletes password cookie and displays the login form
PMA_removeCookie('pmaPass-' . $GLOBALS['server']);
if (! empty($GLOBALS['allowDeny_forbidden'])) {
if (! empty($GLOBALS['root_without_password_is_forbidden'])) {
$conn_error = $GLOBALS['strRootWithoutPassword'];
} elseif (! empty($GLOBALS['allowDeny_forbidden'])) {
$conn_error = $GLOBALS['strAccessDenied'];
} elseif (! empty($GLOBALS['no_activity'])) {
$conn_error = sprintf($GLOBALS['strNoActivity'], $GLOBALS['cfg']['LoginCookieValidity']);