Merge remote-tracking branch 'remotes/origin/QA_3_5'

This commit is contained in:
Jo Michael 2012-03-29 20:30:04 +02:00
commit 62d46b63be

View File

@ -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(