gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/MAINT_3_5_0' into MAINT_3_5_0

Browse Source
This commit is contained in:
Michal Čihař 2012-03-29 20:25:49 +02:00
commit 72804c1637
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/dbi/mysqli.dbi.lib.php
View File

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