diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/file.inc | 4 | ||||
| -rw-r--r-- | includes/form.inc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/includes/file.inc b/includes/file.inc index 24248ad84..38c4999ff 100644 --- a/includes/file.inc +++ b/includes/file.inc @@ -1100,7 +1100,7 @@ function file_validate_size($file, $file_limit = 0, $user_limit = 0) { * * @see hook_file_validate() */ -function file_validate_is_image(&$file) { +function file_validate_is_image($file) { $errors = array(); $info = image_get_info($file->filepath); @@ -1135,7 +1135,7 @@ function file_validate_is_image(&$file) { * * @see hook_file_validate() */ -function file_validate_image_resolution(&$file, $maximum_dimensions = 0, $minimum_dimensions = 0) { +function file_validate_image_resolution($file, $maximum_dimensions = 0, $minimum_dimensions = 0) { $errors = array(); // Check first that the file is an image. diff --git a/includes/form.inc b/includes/form.inc index af42e8e27..703046302 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -291,6 +291,10 @@ function form_set_cache($form_build_id, $form, $form_state) { */ function drupal_execute($form_id, &$form_state) { $args = func_get_args(); + + // Make sure $form_state is passed around by reference. + $args[1] = &$form_state; + $form = call_user_func_array('drupal_retrieve_form', $args); $form['#post'] = $form_state['values']; drupal_prepare_form($form_id, $form, $form_state); |