diff --git a/ChangeLog b/ChangeLog index f27eedcf3..4614eb865 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog $Id$ $Source$ +2006-06-08 Marc Delisle + * libraries/header.inc.php: bug #1501891, undefined PMA_isSuperuser() when + the default server is 0 + 2006-06-06 Marc Delisle * Documentation.html: various fixes, thanks to Cedric Corazza diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 17411032d..9d8c35a62 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -50,7 +50,8 @@ if (empty($GLOBALS['is_header_sent'])) { (!empty($GLOBALS['cfg']['Server']['host']) ? $GLOBALS['cfg']['TitleServer'] : $GLOBALS['cfg']['TitleDefault'])) ); - $is_superuser = PMA_isSuperuser(); + // here, the function does not exist with this configuration: $cfg['ServerDefault'] = 0; + $is_superuser = function_exists('PMA_isSuperuser') && PMA_isSuperuser(); ?>