From 222b01f5169f1c7e69762e0e8904c24f78f71882 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Wed, 28 Jul 2010 11:52:48 +0200 Subject: update to MediaWiki 1.16.0 --- includes/StreamFile.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'includes/StreamFile.php') diff --git a/includes/StreamFile.php b/includes/StreamFile.php index bdd2a2e5..6db66ba8 100644 --- a/includes/StreamFile.php +++ b/includes/StreamFile.php @@ -92,13 +92,12 @@ function wfGetType( $filename, $safe = true ) { if ( $safe ) { global $wgFileBlacklist, $wgCheckFileExtensions, $wgStrictFileExtensions, $wgFileExtensions, $wgVerifyMimeType, $wgMimeTypeBlacklist, $wgRequest; - $form = new UploadForm( $wgRequest ); - list( $partName, $extList ) = $form->splitExtensions( $filename ); - if ( $form->checkFileExtensionList( $extList, $wgFileBlacklist ) ) { + list( $partName, $extList ) = UploadBase::splitExtensions( $filename ); + if ( UploadBase::checkFileExtensionList( $extList, $wgFileBlacklist ) ) { return 'unknown/unknown'; } if ( $wgCheckFileExtensions && $wgStrictFileExtensions - && !$form->checkFileExtensionList( $extList, $wgFileExtensions ) ) + && !UploadBase::checkFileExtensionList( $extList, $wgFileExtensions ) ) { return 'unknown/unknown'; } -- cgit v1.2.3-54-g00ecf