Merge branch 'MAINT_3_5_0' into QA_3_5
This commit is contained in:
commit
2d4d47423c
@ -66,8 +66,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(
|
||||
|
||||
Loading…
Reference in New Issue
Block a user