- Patch #110888 by Eaton: unify hook _alter()

1 files changed, 2 insertions, 5 deletions

diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index bd0d5568b..e2a729489 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -333,7 +333,7 @@ function _upload_prepare(&$node) {
   }
 }
 
-function upload_form_alter($form_id, &$form) {
+function upload_form_alter(&$form, $form_id) {
   if ($form_id == 'node_type_form' && isset($form['identity']['type'])) {
     $form['workflow']['upload'] = array(
       '#type' => 'radios',
@@ -883,10 +883,7 @@ function upload_js() {
   _upload_validate($node);
 
   $form = _upload_form($node);
-  foreach (module_implements('form_alter') as $module) {
-    $function = $module .'_form_alter';
-    $function('upload_js', $form);
-  }
+  drupal_alter('form', $form, 'upload_js');
   $form = form_builder('upload_js', $form);
   $output = theme('status_messages') . drupal_render($form);
   // We send the updated file attachments form.