X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fimport%2FImportStreamSource.php;h=e6936cb2e3b11894f7f441aa609309065b8d7278;hb=bbeeddeafbbc591355bf17379c8e8739476c125b;hp=cf382e48048a372cd0e835bade453d9c81a21b02;hpb=3f59cb9f3a53ad28f8a95fe299c5de6abd24b453;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/import/ImportStreamSource.php b/includes/import/ImportStreamSource.php
index cf382e4804..e6936cb2e3 100644
--- a/includes/import/ImportStreamSource.php
+++ b/includes/import/ImportStreamSource.php
@@ -74,20 +74,21 @@ class ImportStreamSource implements ImportSource {
 		}
 		if ( !empty( $upload['error'] ) ) {
 			switch ( $upload['error'] ) {
-				case 1:
-					# The uploaded file exceeds the upload_max_filesize directive in php.ini.
+				case UPLOAD_ERR_INI_SIZE:
+					// The uploaded file exceeds the upload_max_filesize directive in php.ini.
 					return Status::newFatal( 'importuploaderrorsize' );
-				case 2:
-					# The uploaded file exceeds the MAX_FILE_SIZE directive that
-					# was specified in the HTML form.
+				case UPLOAD_ERR_FORM_SIZE:
+					// The uploaded file exceeds the MAX_FILE_SIZE directive that
+					// was specified in the HTML form.
+					// FIXME This is probably never used since that directive was removed in 8e91c520?
 					return Status::newFatal( 'importuploaderrorsize' );
-				case 3:
-					# The uploaded file was only partially uploaded
+				case UPLOAD_ERR_PARTIAL:
+					// The uploaded file was only partially uploaded
 					return Status::newFatal( 'importuploaderrorpartial' );
-				case 6:
-					# Missing a temporary folder.
+				case UPLOAD_ERR_NO_TMP_DIR:
+					// Missing a temporary folder.
 					return Status::newFatal( 'importuploaderrortemp' );
-				# case else: # Currently impossible
+				// Other error codes get the generic 'importnofile' error message below
 			}
 
 		}
@@ -111,7 +112,7 @@ class ImportStreamSource implements ImportSource {
 		# quicker and sorts out user-agent problems which might
 		# otherwise prevent importing from large sites, such
 		# as the Wikimedia cluster, etc.
-		$data = Http::request(
+		$data = MediaWikiServices::getInstance()->getHttpRequestFactory()->request(
 			$method,
 			$url,
 			[