Permalink
Browse files

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

  • Loading branch information...
2 parents 5243abc + 2d4d474 commit 62d46b63be9c06689ac62d8cb137304fee868e4b Jo Michael committed Mar 29, 2012
Showing with 5 additions and 2 deletions.
  1. +5 −2 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(

0 comments on commit 62d46b6

Please sign in to comment.