X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2FStreamFile.php;h=2ad42e5616f242ad01c4dec928531169c2735920;hp=cce3fc464b10a671a7124cd5f53837c17923627a;hb=e73328601d51674e8fef89c3db12b30ceafd702f;hpb=61898ad28ed69c5b391eb43e0db9386279b9612c

diff --git a/includes/StreamFile.php b/includes/StreamFile.php
index cce3fc464b..2ad42e5616 100644
--- a/includes/StreamFile.php
+++ b/includes/StreamFile.php
@@ -38,7 +38,7 @@ class StreamFile {
 	 * @param array $headers Any additional headers to send if the file exists
 	 * @param bool $sendErrors Send error messages if errors occur (like 404)
 	 * @param array $optHeaders HTTP request header map (e.g. "range") (use lowercase keys)
-	 * @param integer $flags Bitfield of STREAM_* constants
+	 * @param int $flags Bitfield of STREAM_* constants
 	 * @throws MWException
 	 * @return bool Success
 	 */
@@ -64,7 +64,7 @@ class StreamFile {
 	 * Send out a standard 404 message for a file
 	 *
 	 * @param string $fname Full name and path of the file to stream
-	 * @param integer $flags Bitfield of STREAM_* constants
+	 * @param int $flags Bitfield of STREAM_* constants
 	 * @since 1.24
 	 */
 	public static function send404Message( $fname, $flags = 0 ) {
@@ -75,7 +75,7 @@ class StreamFile {
 	 * Convert a Range header value to an absolute (start, end) range tuple
 	 *
 	 * @param string $range Range header value
-	 * @param integer $size File size
+	 * @param int $size File size
 	 * @return array|string Returns error string on failure (start, end, length)
 	 * @since 1.24
 	 */
@@ -113,7 +113,7 @@ class StreamFile {
 			return 'unknown/unknown';
 		}
 
-		$magic = MimeMagic::singleton();
+		$magic = MediaWiki\MediaWikiServices::getInstance()->getMimeAnalyzer();
 		// Use the extension only, rather than magic numbers, to avoid opening
 		// up vulnerabilities due to uploads of files with allowed extensions
 		// but disallowed types.