From: Platonides <platonides@users.mediawiki.org>
Date: Wed, 29 Dec 2010 16:15:23 +0000 (+0000)
Subject: Follow up r67663. Now with 100% less sugar, er.. @s!
X-Git-Tag: 1.31.0-rc.0~33007
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/bilan.php?a=commitdiff_plain;h=c31f0bc39f709fe7bbdf3aaeb2300418d5020736;p=lhc%2Fweb%2Fwiklou.git

Follow up r67663. Now with 100% less sugar, er.. @s!
---

diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index 042ee86771..2d3d8c32ab 100644
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -867,12 +867,14 @@ class CurlHttpRequest extends MWHttpRequest {
 		}
 
 		if ( $this->followRedirects && $this->canFollowRedirects() ) {
-			if ( ! @curl_setopt( $curlHandle, CURLOPT_FOLLOWLOCATION, true ) ) {
+			wfSuppressWarnings();
+			if ( ! curl_setopt( $curlHandle, CURLOPT_FOLLOWLOCATION, true ) ) {
 				wfDebug( __METHOD__ . ": Couldn't set CURLOPT_FOLLOWLOCATION. " .
 					"Probably safe_mode or open_basedir is set.\n" );
 				// Continue the processing. If it were in curl_setopt_array,
 				// processing would have halted on its entry
 			}
+			wfRestoreWarnings();
 		}
 
 		if ( false === curl_exec( $curlHandle ) ) {