| Index: trunk/phase3/includes/HttpFunctions.php |
| — | — | @@ -867,12 +867,14 @@ |
| 868 | 868 | } |
| 869 | 869 | |
| 870 | 870 | if ( $this->followRedirects && $this->canFollowRedirects() ) { |
| 871 | | - if ( ! @curl_setopt( $curlHandle, CURLOPT_FOLLOWLOCATION, true ) ) { |
| | 871 | + wfSuppressWarnings(); |
| | 872 | + if ( ! curl_setopt( $curlHandle, CURLOPT_FOLLOWLOCATION, true ) ) { |
| 872 | 873 | wfDebug( __METHOD__ . ": Couldn't set CURLOPT_FOLLOWLOCATION. " . |
| 873 | 874 | "Probably safe_mode or open_basedir is set.\n" ); |
| 874 | 875 | // Continue the processing. If it were in curl_setopt_array, |
| 875 | 876 | // processing would have halted on its entry |
| 876 | 877 | } |
| | 878 | + wfRestoreWarnings(); |
| 877 | 879 | } |
| 878 | 880 | |
| 879 | 881 | if ( false === curl_exec( $curlHandle ) ) { |