summaryrefslogtreecommitdiff
path: root/includes/StreamFile.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2010-07-28 11:52:48 +0200
committerPierre Schmitz <pierre@archlinux.de>2010-07-28 11:52:48 +0200
commit222b01f5169f1c7e69762e0e8904c24f78f71882 (patch)
tree8e932e12546bb991357ec48eb1638d1770be7a35 /includes/StreamFile.php
parent00ab76a6b686e98a914afc1975812d2b1aaa7016 (diff)
update to MediaWiki 1.16.0
Diffstat (limited to 'includes/StreamFile.php')
-rw-r--r--includes/StreamFile.php7
1 files changed, 3 insertions, 4 deletions
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';
}