From: Niklas Laxström <niklas.laxstrom@gmail.com>
Date: Wed, 22 Jul 2015 19:43:17 +0000 (+0200)
Subject: Use feature test rather than version check
X-Git-Tag: 1.31.0-rc.0~10678^2
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=4c9a819b2146c2644db6a9b50ac4d50b6365ecca;p=lhc%2Fweb%2Fwiklou.git

Use feature test rather than version check

Not sure why I didn't do this in the first place.

Bug: T106579
Change-Id: I238aedacd4f960ad4ca7549c232fd3a7eec3f02f
---

diff --git a/includes/libs/MultiHttpClient.php b/includes/libs/MultiHttpClient.php
index aa0cc46cb1..2e7ef88361 100644
--- a/includes/libs/MultiHttpClient.php
+++ b/includes/libs/MultiHttpClient.php
@@ -228,7 +228,7 @@ class MultiHttpClient {
 			if ( $errno !== 0 ) {
 				$req['response']['error'] = "(curl error: $errno)";
 
-				if ( version_compare( PHP_VERSION, '5.5.0' ) >= 0 ) {
+				if ( function_exists( 'curl_strerror' ) ) {
 					$req['response']['error'] .= " " . curl_strerror( $errno );
 				}
 			}