Merge "Replace MimeMagic::singleton() calls"

[lhc/web/wiklou.git] / includes / upload / UploadFromFile.php

diff --git a/includes/upload/UploadFromFile.php b/includes/upload/UploadFromFile.php
index 5bc040c..675bb8d 100644 (file)
--- a/includes/upload/UploadFromFile.php
+++ b/includes/upload/UploadFromFile.php
@@ -28,14 +28,13 @@
  * @author Bryan Tong Minh
  */
 class UploadFromFile extends UploadBase {
-
        /**
         * @var WebRequestUpload
         */
        protected $mUpload = null;
 
        /**
-        * @param WebRequest $request
+        * @param WebRequest &$request
         */
        function initializeFromRequest( &$request ) {
                $upload = $request->getUpload( 'wpUploadFile' );
@@ -83,14 +82,13 @@ class UploadFromFile extends UploadBase {
                # proper error can be shown to the user
                if ( is_null( $this->mTempPath ) || $this->isEmptyFile() ) {
                        if ( $this->mUpload->isIniSizeOverflow() ) {
-                               return array(
+                               return [
                                        'status' => UploadBase::FILE_TOO_LARGE,
                                        'max' => min(
                                                self::getMaxUploadSize( $this->getSourceType() ),
-                                               wfShorthandToInteger( ini_get( 'upload_max_filesize' ) ),
-                                               wfShorthandToInteger( ini_get( 'post_max_size' ) )
+                                               self::getMaxPhpUploadSize()
                                        ),
-                               );
+                               ];
                        }
                }