Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -73,6 +73,8 @@ phpMyAdmin - ChangeLog
 - bug #3431427 [display] Dropdown results - setting NULL does not work
 - patch #3428764 [edit] Inline edit on multi-server configuration
 - patch #3437354 [core] Notice: Array to string conversion in PHP 5.4
+- [interface] When ShowTooltipAliasTB is true, VIEW is wrongly shown as the
+  view name in main panel db Structure page
 
 3.4.7.1 (2011-11-10)
 - [security] Fixed possible local file inclusion in XML import

libraries/db_info.inc.php

@@ -50,6 +50,10 @@ function PMA_fillTooltip(&$tooltip_truename, &$tooltip_aliasname, $table)
         // remove InnoDB comment from end, just the minimal part (*? is non greedy)
         $table['Comment'] = preg_replace('@; InnoDB free:.*?$@', '', $table['Comment']);
     }
+    // views have VIEW as comment so it's not a real comment put by a user
+    if ('VIEW' == $table['Comment']) {
+        $table['Comment'] = '';
+    }
     if (empty($table['Comment'])) {
         $table['Comment'] = $table['Name'];
     } else {