From 5b2befc1716bfca6b21305a0cb5df6d965eb4c9a Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 24 Sep 2011 06:03:25 -0400
Subject: [PATCH 1/2] bug #3411633 [core] Call to undefined function
 PMA_isSuperuser()

---
 ChangeLog | 1 +
 main.php  | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6ba0b676c3..e46b9df864 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,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/main.php b/main.php
index 836a250433..0b0de1a26c 100644
--- a/main.php
+++ b/main.php
@@ -142,10 +142,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>';
 

From 158ce0657a8e9779348bbde43332b6a07ee37886 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 24 Sep 2011 06:17:34 -0400
Subject: [PATCH 2/2] Undefined variables when no server has been selected and
 no default server is defined

---
 libraries/header_scripts.inc.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php
index c25aa990ea..a65445bef8 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) {
 // Updates the title of the frameset if possible (ns4 does not allow this)
 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