diff options
Diffstat (limited to 'includes/file.inc')
| -rw-r--r-- | includes/file.inc | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/includes/file.inc b/includes/file.inc index 8df67ec65..a6702cac8 100644 --- a/includes/file.inc +++ b/includes/file.inc @@ -713,26 +713,6 @@ function file_directory_path() { } /** - * Helper function for file_upload_max_size(). - */ -function _file_convert_to_mb($val){ - $val = trim($val); - $last = strtolower($val[strlen($val) - 1]); - switch ($last) { - // The 'G' modifier is available since PHP 5.1.0 - case 'g': - $size = $val * 1024; - break; - case 'k': - $size = $val / 1024; - break; - default: - $size = (int) $val; - } - return $size; -} - -/** * Determine the maximum file upload size by querying the PHP settings. * * @return @@ -742,9 +722,9 @@ function file_upload_max_size() { static $max_size = -1; if ($max_size < 0) { - $upload_max = _file_convert_to_mb(ini_get('upload_max_filesize')); + $upload_max = parse_size(ini_get('upload_max_filesize')); // sanity check- a single upload should not be more than 50% the size limit of the total post - $post_max = _file_convert_to_mb(ini_get('post_max_size')) / 2; + $post_max = parse_size(ini_get('post_max_size')) / 2; $max_size = ($upload_max < $post_max) ? $upload_max : $post_max; } return $max_size; |