Merge "Always defer the log publish() in recordUpload2"

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

diff --git a/includes/upload/UploadFromFile.php b/includes/upload/UploadFromFile.php
index a00ed32..1607cb6 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 $request WebRequest
+        * @param WebRequest $request
         */
        function initializeFromRequest( &$request ) {
                $upload = $request->getUpload( 'wpUploadFile' );
@@ -49,8 +48,8 @@ class UploadFromFile extends UploadBase {
 
        /**
         * Initialize from a filename and a WebRequestUpload
-        * @param $name
-        * @param $webRequestUpload
+        * @param string $name
+        * @param WebRequestUpload $webRequestUpload
         */
        function initialize( $name, $webRequestUpload ) {
                $this->mUpload = $webRequestUpload;
@@ -59,7 +58,7 @@ class UploadFromFile extends UploadBase {
        }
 
        /**
-        * @param $request
+        * @param WebRequest $request
         * @return bool
         */
        static function isValidRequest( $request ) {
@@ -87,8 +86,7 @@ class UploadFromFile extends UploadBase {
                                        '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()
                                        ),
                                );
                        }