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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-01-21 13:38:10 +01:00
commit c80ce3fde4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/plugins/auth/AuthenticationCookie.class.php
View File

@ -79,8 +79,9 @@ class AuthenticationCookie extends AuthenticationPlugin
sprintf(
'<a href="%s" class="ajax login-link">%s</a>',
$GLOBALS['cfg']['PmaAbsoluteUri'],
__('Log in')) .
' ]';
__('Log in')
)
. ' ]';
if (! empty($conn_error)) {
@ -264,7 +265,10 @@ class AuthenticationCookie extends AuthenticationPlugin
// show the "Cookies required" message only if cookies are disabled
// (we previously tried to set some cookies)
if (empty($_COOKIE)) {
trigger_error(__('Cookies must be enabled past this point.'), E_USER_NOTICE);
trigger_error(
__('Cookies must be enabled past this point.'),
E_USER_NOTICE
);
}
if ($GLOBALS['error_handler']->hasDisplayErrors()) {
echo '<div>';