Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
24c48d999a
@ -252,7 +252,7 @@ class Header
|
||||
'confirm' => $GLOBALS['cfg']['Confirm'],
|
||||
'LoginCookieValidity' => $GLOBALS['cfg']['LoginCookieValidity'],
|
||||
'session_gc_maxlifetime' => (int)@ini_get('session.gc_maxlifetime'),
|
||||
'logged_in' => $GLOBALS['dbi']->isUserType('logged'),
|
||||
'logged_in' => (isset($GLOBALS['dbi']) ? $GLOBALS['dbi']->isUserType('logged') : false),
|
||||
'is_https' => $GLOBALS['PMA_Config']->isHttps(),
|
||||
'rootPath' => $GLOBALS['PMA_Config']->getRootPath(),
|
||||
'PMA_VERSION' => PMA_VERSION
|
||||
|
||||
Loading…
Reference in New Issue
Block a user