diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/upload/upload.admin.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/upload/upload.admin.inc b/modules/upload/upload.admin.inc index 1d3603d9e..18754a103 100644 --- a/modules/upload/upload.admin.inc +++ b/modules/upload/upload.admin.inc @@ -14,7 +14,7 @@ function upload_admin_settings_validate($form, &$form_state) { $default_uploadsize = $form_state['values']['upload_uploadsize_default']; $default_usersize = $form_state['values']['upload_usersize_default']; - $exceed_max_msg = t('Your PHP settings limit the maximum file size per upload to %size MB.', array('%size' => file_upload_max_size())) .'<br/>'; + $exceed_max_msg = t('Your PHP settings limit the maximum file size per upload to %size.', array('%size' => format_size(file_upload_max_size()))) .'<br/>'; $more_info = t("Depending on your sever environment, these settings may be changed in the system-wide php.ini file, a php.ini file in your Drupal root directory, in your Drupal site's settings.php file, or in the .htaccess file in your Drupal root directory."); if (!is_numeric($default_uploadsize) || ($default_uploadsize <= 0)) { @@ -23,7 +23,7 @@ function upload_admin_settings_validate($form, &$form_state) { if (!is_numeric($default_usersize) || ($default_usersize <= 0)) { form_set_error('upload_usersize_default', t('The %role file size limit must be a number and greater than zero.', array('%role' => t('default')))); } - if ($default_uploadsize > file_upload_max_size()) { + if ($default_uploadsize * 1024 * 1024 > file_upload_max_size()) { form_set_error('upload_uploadsize_default', $exceed_max_msg . $more_info); $more_info = ''; } @@ -41,7 +41,7 @@ function upload_admin_settings_validate($form, &$form_state) { if (!is_numeric($usersize) || ($usersize <= 0)) { form_set_error('upload_usersize_'. $rid, t('The %role file size limit must be a number and greater than zero.', array('%role' => $role))); } - if ($uploadsize > file_upload_max_size()) { + if ($uploadsize * 1024 * 1024 > file_upload_max_size()) { form_set_error('upload_uploadsize_'. $rid, $exceed_max_msg . $more_info); $more_info = ''; } |