From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 23 May 2006 20:49:30 +0000 (+0000)
Subject: Versioncruft: remove a check for PHP 4.1 workaround, no longer needed
X-Git-Tag: 1.31.0-rc.0~57053
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28%27votes%27%2C%20votes=%27waiting%27%29%20%7D%7D?a=commitdiff_plain;h=a9464cea8753d6f9d0081d6ec169ec9d678021cb;p=lhc%2Fweb%2Fwiklou.git

Versioncruft: remove a check for PHP 4.1 workaround, no longer needed
---

diff --git a/includes/Database.php b/includes/Database.php
index 8376f06fd3..2bdf610baa 100644
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -270,14 +270,7 @@ class Database {
 			@/**/$this->mConn = mysql_pconnect( $server, $user, $password );
 		} else {
 			# Create a new connection...
-			if( version_compare( PHP_VERSION, '4.2.0', 'ge' ) ) {
-				@/**/$this->mConn = mysql_connect( $server, $user, $password, true );
-			} else {
-				# On PHP 4.1 the new_link parameter is not available. We cannot
-				# guarantee that we'll actually get a new connection, and this
-				# may cause some operations to fail possibly.
-				@/**/$this->mConn = mysql_connect( $server, $user, $password );
-			}
+			@/**/$this->mConn = mysql_connect( $server, $user, $password, true );
 		}
 
 		if ( $dbName != '' ) {