From 685fa958d33ec478e4a65042997ceb09367eac57 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 23 May 2013 07:02:20 -0400
Subject: [PATCH 1/2] bug #3927 List of tables is missing after expanding in
 the navigation frame

---
 ChangeLog                                     | 1 +
 libraries/navigation/NavigationTree.class.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index fffe91cbc0..db76259abf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
 4.0.3.0 (not yet released)
 - bug #3941 Recent tables list always empty
 - bug #3933 Do not translate "Open Document" in export settings
+- bug #3927 List of tables is missing after expanding in the navigation frame
 
 4.0.2.0 (not yet released)
 - bug #3902 Cannot browse when table name contains keyword "call"
diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php
index 3b352b80b5..922c52ba17 100644
--- a/libraries/navigation/NavigationTree.class.php
+++ b/libraries/navigation/NavigationTree.class.php
@@ -928,7 +928,8 @@ class PMA_NavigationTree
                         $title = $node->getComment();
                         if ($title) {
                             $title = " title='"
-                                . htmlentities($title, ENT_QUOTES) . "'";
+                                . htmlentities($title, ENT_QUOTES, 'UTF-8') 
+                                . "'";
                         }
                     } else {
                         $title = '';

From ea5a1b26103773ce0798094268ad709f0c410c84 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 23 May 2013 07:05:44 -0400
Subject: [PATCH 2/2] Produce valid XHTML

---
 libraries/navigation/NavigationTree.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php
index 922c52ba17..d92c694f82 100644
--- a/libraries/navigation/NavigationTree.class.php
+++ b/libraries/navigation/NavigationTree.class.php
@@ -927,9 +927,9 @@ class PMA_NavigationTree
                     if ($GLOBALS['cfg']['ShowTooltip']) {
                         $title = $node->getComment();
                         if ($title) {
-                            $title = " title='"
+                            $title = ' title="'
                                 . htmlentities($title, ENT_QUOTES, 'UTF-8') 
-                                . "'";
+                                . '"';
                         }
                     } else {
                         $title = '';