diff --git a/ChangeLog b/ChangeLog index 99e2dc61b8..cd028c7b56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ phpMyAdmin - ChangeLog - bug #3383572 [interface] Cannot execute saved query - bug #3411535 [display] Full text button unchecks results display options - bug #3411224 [display] Broken binary column when 'Show binary contents' is not set +- bug #3411633 [core] Call to undefined function PMA_isSuperuser() 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php index 21c5d9a870..d211e48f01 100644 --- a/libraries/header_scripts.inc.php +++ b/libraries/header_scripts.inc.php @@ -20,12 +20,14 @@ if ( false === $GLOBALS['cfg']['AllowThirdPartyFraming']) { } // generate title (unless we already have $page_title, from cookie auth) if (! isset($page_title)) { - $title = PMA_expandUserString( - !empty($GLOBALS['table']) ? $GLOBALS['cfg']['TitleTable'] : - (!empty($GLOBALS['db']) ? $GLOBALS['cfg']['TitleDatabase'] : - (!empty($GLOBALS['cfg']['Server']['host']) ? $GLOBALS['cfg']['TitleServer'] : + if ($GLOBALS['server'] > 0) { + $title = PMA_expandUserString( + ! empty($GLOBALS['table']) ? $GLOBALS['cfg']['TitleTable'] : + (! empty($GLOBALS['db']) ? $GLOBALS['cfg']['TitleDatabase'] : + (! empty($GLOBALS['cfg']['Server']['host']) ? $GLOBALS['cfg']['TitleServer'] : $GLOBALS['cfg']['TitleDefault'])) ); + } } else { $title = $page_title; } @@ -57,7 +59,7 @@ foreach ($GLOBALS['js_include'] as $js_script_file) { // '; + parent.document.title = ''; } 0) { diff --git a/main.php b/main.php index f85f1c011b..051b5efc18 100644 --- a/main.php +++ b/main.php @@ -139,10 +139,12 @@ echo ''; // User preferences -echo '