Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2013-06-08 14:45:06 +02:00
commit a75978d600

View File

@ -427,7 +427,7 @@ class PMA_Menu
*/
private function _getServerTabs()
{
$is_superuser = $GLOBALS['dbi']->isSuperuser();
$is_superuser = isset($GLOBALS['dbi']) && $GLOBALS['dbi']->isSuperuser();
$binary_logs = null;
if (!defined('PMA_DRIZZLE') || (defined('PMA_DRIZZLE') && ! PMA_DRIZZLE)) {
$binary_logs = $GLOBALS['dbi']->fetchResult(