Merge remote-tracking branch 'origin/master'

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

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) {
 // <![CDATA[
 if (typeof(parent.document) != 'undefined' && typeof(parent.document) != 'unknown'
     && typeof(parent.document.title) == 'string') {
-    parent.document.title = '<?php echo PMA_sanitize(PMA_escapeJsString(htmlspecialchars($title))); ?>';
+    parent.document.title = '<?php echo (isset($title) ? PMA_sanitize(PMA_escapeJsString(htmlspecialchars($title))) : ''); ?>';
 }
 <?php
 if(count($GLOBALS['js_script']) > 0) {

main.php

@@ -139,10 +139,12 @@ echo '</ul>';
 
 // User preferences
 
-echo '<ul>';
-echo PMA_printListItem(__('More settings'), 'li_user_preferences',
+if ($server > 0) {
+    echo '<ul>';
+    echo PMA_printListItem(__('More settings'), 'li_user_preferences',
                     './prefs_manage.php?' . $common_url_query);
-echo '</ul>';
+    echo '</ul>';
+}
 
 echo '</div>';