Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -17,6 +17,7 @@ phpMyAdmin - ChangeLog
 
 3.5.1.0 (not yet released)
 - bug #3510784 [edit] Limit clause ignored when sort order is remembered
+- bug #3511471 [interface] View name not seen in navi panel (MySQL 5.1)
 
 3.5.0.0 (not yet released)
 + rfe #2021981 [interface] Add support for mass prefix change.

libraries/common.lib.php

@@ -823,6 +823,7 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count =
         if ($GLOBALS['cfg']['ShowTooltipAliasTB']
             && $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested'
             && $table['Comment'] // do not switch if the comment is empty
+            && $table['Comment'] != 'VIEW' // happens in MySQL 5.1
         ) {
             // switch tooltip and name
             $table['disp_name'] = $table['Comment'];

libraries/dbi/mysqli.dbi.lib.php

@@ -67,8 +67,11 @@ function PMA_DBI_real_connect($link, $host, $user, $password, $dbname, $server_p
 {
     global $cfg;
 
-    if ($cfg['PersistentConnections'] || $persistent) {
-        $host = 'p:' . $host;
+    // mysqli persistent connections only on PHP 5.3+
+    if (PMA_PHP_INT_VERSION >= 50300) {
+        if ($cfg['PersistentConnections'] || $persistent) {
+            $host = 'p:' . $host;
+        }
     }
     if ($client_flags === null) {
         return @mysqli_real_connect(