From 1fe90cba4f4015846021d0074d3335ba05fea393 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 4 Jun 2007 07:22:23 +0000
Subject: - Patch #146667 by Eaton: correct builder argument ordering,
 eliminate redundant arguments

---
 modules/upload/upload.module | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'modules/upload/upload.module')

diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index c0b7685d1..b56dfa57b 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -100,15 +100,15 @@ function upload_menu_alter(&$items) {
 /**
  * Form API callback to validate the upload settings form.
  */
-function upload_admin_settings_validate($form, &$form_state, $form_values) {
-  if (($form_values['upload_max_resolution'] != '0')) {
-    if (!preg_match('/^[0-9]+x[0-9]+$/', $form_values['upload_max_resolution'])) {
+function upload_admin_settings_validate($form, &$form_state) {
+  if (($form_state['values']['upload_max_resolution'] != '0')) {
+    if (!preg_match('/^[0-9]+x[0-9]+$/', $form_state['values']['upload_max_resolution'])) {
       form_set_error('upload_max_resolution', t('The maximum allowed image size expressed as WIDTHxHEIGHT (e.g. 640x480). Set to 0 for no restriction.'));
     }
   }
 
-  $default_uploadsize = $form_values['upload_uploadsize_default'];
-  $default_usersize = $form_values['upload_usersize_default'];
+  $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/>';
   $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.");
@@ -127,9 +127,9 @@ function upload_admin_settings_validate($form, &$form_state, $form_values) {
     form_set_error('upload_uploadsize_default', t('The %role maximum file size per upload is greater than the total file size allowed per user', array('%role' => t('default'))));
   }
 
-  foreach ($form_values['roles'] as $rid => $role) {
-    $uploadsize = $form_values['upload_uploadsize_'. $rid];
-    $usersize = $form_values['upload_usersize_'. $rid];
+  foreach ($form_state['values']['roles'] as $rid => $role) {
+    $uploadsize = $form_state['values']['upload_uploadsize_'. $rid];
+    $usersize = $form_state['values']['upload_usersize_'. $rid];
 
     if (!is_numeric($uploadsize) || ($uploadsize <= 0)) {
       form_set_error('upload_uploadsize_'. $rid, t('The %role file size limit must be a number and greater than zero.', array('%role' => $role)));
-- 
cgit v1.2.3