More rigorous fix for ImageMagick parameter interpretation (bug 23148 etc.) based...

[lhc/web/wiklou.git] / includes / StreamFile.php

diff --git a/includes/StreamFile.php b/includes/StreamFile.php
index bdd2a2e..6db66ba 100644 (file)
--- 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';
                }