Index: uc_donation.module
===================================================================
RCS file: /cvs/donate/uc_donation/uc_donation.module,v
retrieving revision 1.1
diff -u -r1.1 uc_donation.module
--- uc_donation.module	21 Nov 2008 21:03:44 -0000	1.1
+++ uc_donation.module	21 Nov 2008 21:04:07 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: uc_donation.module,v 1.1 2008/11/21 21:03:44 admin Exp $
+// $Id: uc_donation.module,v 1.2.4.1 2008/11/13 22:23:41 greenskin Exp $
 
 /**
  * @file
@@ -463,7 +463,7 @@
   return $output;
 }
 
-function uc_donation_add_to_cart_form($node){
+function uc_donation_add_to_cart_form(&$form_state, $node){
   $form = array();
   $form['#base'] = 'uc_donation_add_to_cart_form';
   $form['nid'] = array('#type' => 'value', '#value' => $node->nid);
@@ -476,19 +476,21 @@
     '#required' => TRUE
   );
   $form['submit'] = array('#type' => 'submit', '#value' =>  variable_get('add_to_cart_text_donation', t('Add to cart')), );
+  // direct to validate & submit functions
+  $form['#validate'][] = 'uc_donation_add_to_cart_form_validate';
+  $form['#submit'][] = 'uc_donation_add_to_cart_form_submit';
   return $form;
 }
 
-function uc_donation_add_to_cart_form_validate($form_id, $form_values){
-  $form_values['donate_price'] = str_replace('$','',$form_values['donate_price']);
-  if (!is_numeric($form_values['donate_price']) || intval($form_values['donate_price']) <= 0){
+function uc_donation_add_to_cart_form_validate($form, &$form_state){
+  $form_state['values']['donate_price'] = str_replace('$','', $form_state['values']['donate_price']);
+  if (!is_numeric($form_state['values']['donate_price']) || intval($form_state['values']['donate_price']) <= 0){
     form_set_error('price', t('You have entered an invalid amount.'));
   }
 }
 
-function uc_donation_add_to_cart_form_submit($form_id, $form_values){
-  $form_values['donate_price'] = str_replace('$','',$form_values['donate_price']);
-  return uc_cart_add_item($form_values['nid'], 1,  module_invoke_all('add_to_cart_data', $form_values));
+function uc_donation_add_to_cart_form_submit($form, &$form_state){
+  return uc_cart_add_item($form_state['values']['nid'], 1,  module_invoke_all('add_to_cart_data', $form_state['values']));
 }
 
 function uc_donation_cart_view_validate($form_id, $form_values) {
@@ -576,7 +578,7 @@
 }
 
 /**
- * Implementation of Übercart hook_cart_display().
+ * Implementation of Ubercart hook_cart_display().
  */
 function uc_donation_cart_display($item){
   $node = node_load($item->nid);
@@ -613,7 +615,7 @@
 }
 
 /******************************************************************************
- * Übercart Hooks
+ * Ubercart Hooks
  ******************************************************************************/
 
 /**