From 2707614590b7cdeba8a4b13cc44dadbfa8e07fe1 Mon Sep 17 00:00:00 2001 From: Benjamin Lees Date: Wed, 5 Aug 2009 04:27:19 +0000 Subject: [PATCH] Convert check to use wfShorthandToInteger() --- includes/specials/SpecialUpload.php | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php index 91456f072b..277dfde885 100644 --- a/includes/specials/SpecialUpload.php +++ b/includes/specials/SpecialUpload.php @@ -735,21 +735,7 @@ wgUploadAutoFill = {$autofill}; # Get the maximum file size from php.ini as $wgMaxUploadSize works for uploads from URL via CURL only # See http://www.php.net/manual/en/ini.core.php#ini.upload-max-filesize for possible values of upload_max_filesize - $val = trim( ini_get( 'upload_max_filesize' ) ); - $last = strtoupper( ( substr( $val, -1 ) ) ); - switch( $last ) { - case 'G': - $val2 = substr( $val, 0, -1 ) * 1024 * 1024 * 1024; - break; - case 'M': - $val2 = substr( $val, 0, -1 ) * 1024 * 1024; - break; - case 'K': - $val2 = substr( $val, 0, -1 ) * 1024; - break; - default: - $val2 = $val; - } + $val = wfShorthandToInteger( ini_get( 'upload_max_filesize' ) ); $maxUploadSize = '
' . wfMsgExt( 'upload-maxfilesize', array( 'parseinline', 'escapenoentities' ), $wgLang->formatSize( $val2 ) ) . -- 2.20.1