Merge remote-tracking branch 'origin/master'

2013-05-23 13:07:37 +02:00 · 2013-05-23 13:07:37 +02:00 · a518df0e1d
commit a518df0e1d
parent 767308add0 83cde619f6
2 changed files with 4 additions and 2 deletions
--- a/1
+++ b/1
@ -18,6 +18,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"
--- a/libraries/navigation/NavigationTree.class.php
+++ b/libraries/navigation/NavigationTree.class.php
@ -927,8 +927,9 @@ class PMA_NavigationTree
                    if ($GLOBALS['cfg']['ShowTooltip']) {
                        $title = $node->getComment();
                        if ($title) {
-                            $title = " title='"
-                                . htmlentities($title, ENT_QUOTES) . "'";
+                            $title = ' title="'
+                                . htmlentities($title, ENT_QUOTES, 'UTF-8') 
+                                . '"';
                        }
                    } else {
                        $title = '';