X-Git-Url: https://git.cyclocoop.org/admin/?a=blobdiff_plain;f=includes%2Fhttp%2FCurlHttpRequest.php;h=44bdddbaab77057ebbb3aa795e3a11d678a485c1;hb=c5052ef26d683dedef07d77688c68f4ab751fe0c;hp=7fd3e835c423b88f729d4128bf3343b27ef9aaef;hpb=127c0072c4d29902fbf2dcfd63464042462270ed;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/http/CurlHttpRequest.php b/includes/http/CurlHttpRequest.php
index 7fd3e835c4..44bdddbaab 100644
--- a/includes/http/CurlHttpRequest.php
+++ b/includes/http/CurlHttpRequest.php
@@ -37,6 +37,12 @@ class CurlHttpRequest extends MWHttpRequest {
 		return strlen( $content );
 	}
 
+	/**
+	 * @see MWHttpRequest::execute
+	 *
+	 * @throws MWException
+	 * @return Status
+	 */
 	public function execute() {
 		$this->prepare();
 
@@ -105,14 +111,14 @@ class CurlHttpRequest extends MWHttpRequest {
 		}
 
 		if ( $this->followRedirects && $this->canFollowRedirects() ) {
-			MediaWiki\suppressWarnings();
+			Wikimedia\suppressWarnings();
 			if ( !curl_setopt( $curlHandle, CURLOPT_FOLLOWLOCATION, true ) ) {
 				$this->logger->debug( __METHOD__ . ": Couldn't set CURLOPT_FOLLOWLOCATION. " .
 					"Probably open_basedir is set.\n" );
 				// Continue the processing. If it were in curl_setopt_array,
 				// processing would have halted on its entry
 			}
-			MediaWiki\restoreWarnings();
+			Wikimedia\restoreWarnings();
 		}
 
 		if ( $this->profiler ) {
@@ -139,7 +145,7 @@ class CurlHttpRequest extends MWHttpRequest {
 		$this->parseHeader();
 		$this->setStatus();
 
-		return Status::wrap( $this->status );  // TODO B/C; move this to callers
+		return Status::wrap( $this->status ); // TODO B/C; move this to callers
 	}
 
 	/**