From 96926ca04707d6eda0e96b2ae7eb01efb708c3ec Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 28 May 2007 06:08:47 +0000
Subject: - Patch #146470 by Eaton et al: standardize form API3 hook parameter
 order.

---
 modules/aggregator/aggregator.module | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index f0074b584..806c59a95 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -357,7 +357,7 @@ function aggregator_form_category($edit = array('title' => '', 'description' =>
 /**
  * Validate aggregator_form_feed form submissions.
  */
-function aggregator_form_category_validate($form_values, $form, &$form_state) {
+function aggregator_form_category_validate($form, &$form_state, $form_values) {
   if ($form_values['op'] == t('Submit')) {
     // Check for duplicate titles
     if (isset($form_values['cid'])) {
@@ -376,7 +376,7 @@ function aggregator_form_category_validate($form_values, $form, &$form_state) {
  * Process aggregator_form_category form submissions.
  * @todo Add delete confirmation dialog.
  */
-function aggregator_form_category_submit($form_values, $form, &$form_state) {
+function aggregator_form_category_submit($form, &$form_state, $form_values) {
   if ($form_values['op'] == t('Delete')) {
     $title = $form_values['title'];
     // Unset the title:
@@ -492,7 +492,7 @@ function aggregator_form_feed($edit = array('refresh' => 900, 'title' => '', 'ur
 /**
  * Validate aggregator_form_feed form submissions.
  */
-function aggregator_form_feed_validate($form_values, $form, &$form_state) {
+function aggregator_form_feed_validate($form, &$form_state, $form_values) {
   if ($form_values['op'] == t('Submit')) {
     // Check for duplicate titles
     if (isset($form_values['fid'])) {
@@ -516,7 +516,7 @@ function aggregator_form_feed_validate($form_values, $form, &$form_state) {
  * Process aggregator_form_feed form submissions.
  * @todo Add delete confirmation dialog.
  */
-function aggregator_form_feed_submit($form_values, $form, &$form_state) {
+function aggregator_form_feed_submit($form, &$form_state, $form_values) {
   if ($form_values['op'] == t('Delete')) {
     $title = $form_values['title'];
     // Unset the title:
@@ -1170,7 +1170,7 @@ function aggregator_page_list_validate($form_id, &$form) {
   }
 }
 
-function aggregator_page_list_submit($form_values, $form, &$form_state) {
+function aggregator_page_list_submit($form, &$form_state, $form_values) {
   foreach ($form_values['categories'] as $iid => $selection) {
     db_query('DELETE FROM {aggregator_category_item} WHERE iid = %d', $iid);
     foreach ($selection as $cid) {
-- 
cgit v1.2.3