- Patch #146470 by Eaton et al: standardize form API3 hook parameter order.

1 files changed, 5 insertions, 5 deletions

diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index 8ba005110..d7ce16b7b 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -294,7 +294,7 @@ function menu_edit_item_form($type, $mid = 0) {
   return $form;
 }
 
-function menu_edit_item_form_validate($form_values, $form, &$form_state) {
+function menu_edit_item_form_validate($form, &$form_state, $form_values) {
   if (isset($form_values['path'])) {
     $path = $form_values['path'];
     // Skip external links.
@@ -314,7 +314,7 @@ function menu_edit_item_form_validate($form_values, $form, &$form_state) {
 /**
  * Process menu and menu item add/edit form submissions.
  */
-function menu_edit_item_form_submit($form_values, $form, &$form_state) {
+function menu_edit_item_form_submit($form, &$form_state, $form_values) {
   menu_edit_item_save($form_values);
   $form_state['redirect'] = 'admin/build/menu';
   return;
@@ -468,7 +468,7 @@ function menu_item_delete_form($mid) {
 /**
  * Process menu delete form submissions.
  */
-function menu_item_delete_form_submit($form_values, $form, &$form_state) {
+function menu_item_delete_form_submit($form, &$form_state, $form_values) {
   menu_delete_item($form_values['path']);
 
   $t_args = array('%title' => $form_values['title']);
@@ -501,7 +501,7 @@ function menu_reset_item($mid) {
 /**
  * Process menu reset item form submissions.
  */
-function menu_reset_item_submit($form_values, $form, &$form_state) {
+function menu_reset_item_submit($form, &$form_state, $form_values) {
   menu_delete_item($form_values['mid']);
   drupal_set_message(t('The menu item was reset to its default settings.'));
 
@@ -578,7 +578,7 @@ function _menu_nodeapi(&$node, $op) {
  * Implementation of hook_form_alter().
  * Add menu item fields to the node form.
  */
-function _menu_form_alter(&$form, $form_id) {
+function _menu_form_alter(&$form, $form_state, $form_id) {
   if (isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id) {
     $item = array();
     if ($form['nid']['#value'] > 0) {