=== modified file 'ca/ca.ca.inc' --- ca/ca.ca.inc 2009-04-07 17:30:38 +0000 +++ ca/ca.ca.inc 2009-04-28 16:27:30 +0000 @@ -257,7 +257,7 @@ '#type' => 'select', '#title' => t('Node field'), '#options' => $options, - '#default_values' => $setting['field'], + '#default_values' => $settings['field'], ); // Define the operators for the fields. === modified file 'payment/uc_2checkout/uc_2checkout.pages.inc' --- payment/uc_2checkout/uc_2checkout.pages.inc 2008-10-13 18:26:36 +0000 +++ payment/uc_2checkout/uc_2checkout.pages.inc 2009-04-28 16:34:34 +0000 @@ -51,7 +51,7 @@ } else { drupal_set_message(t('Your order will be processed as soon as your payment clears at 2Checkout.com.')); - uc_order_comment_save($order_id, 0, t('!type payment is pending approval at 2Checkout.com.', array('!type' => $_POST['pay_method'] == 'CC' ? t('Credit card') : t('eCheck'))), 'admin'); + uc_order_comment_save($order->order_id, 0, t('!type payment is pending approval at 2Checkout.com.', array('!type' => $_POST['pay_method'] == 'CC' ? t('Credit card') : t('eCheck'))), 'admin'); } // Empty that cart... === modified file 'payment/uc_authorizenet/uc_authorizenet.admin.inc' --- payment/uc_authorizenet/uc_authorizenet.admin.inc 2008-11-07 18:42:00 +0000 +++ payment/uc_authorizenet/uc_authorizenet.admin.inc 2009-04-28 16:36:19 +0000 @@ -9,6 +9,7 @@ // Displays a form to update a subscriptions's CC info. function uc_authorizenet_arb_admin_update_form($form_state, $rfid) { + $order = new stdClass(); $form = array(); $fee = uc_recurring_fee_load('user', $rfid); === modified file 'payment/uc_authorizenet/uc_authorizenet.module' --- payment/uc_authorizenet/uc_authorizenet.module 2009-04-18 01:03:01 +0000 +++ payment/uc_authorizenet/uc_authorizenet.module 2009-04-28 16:37:08 +0000 @@ -864,7 +864,7 @@ function uc_authorizenet_arb_update($subscription_id, $updates, $order_id = NULL) { $server = variable_get('uc_authnet_arb_mode', 'disabled'); - unset($update['paymentSchedule']); + unset($updates['paymentSchedule']); // Build the data array for the request. $data = array( === modified file 'payment/uc_authorizenet/uc_authorizenet.pages.inc' --- payment/uc_authorizenet/uc_authorizenet.pages.inc 2008-11-07 18:42:00 +0000 +++ payment/uc_authorizenet/uc_authorizenet.pages.inc 2009-04-28 16:38:53 +0000 @@ -149,6 +149,6 @@ drupal_set_message(t('An error has occurred. Please try again and contact us if the problem persists.'), 'error'); } - $form_state['redirect'] = 'user/'. $uid; + $form_state['redirect'] = 'user/'. $form_state['values']['uid']; } === modified file 'payment/uc_credit/uc_credit.admin.inc' --- payment/uc_credit/uc_credit.admin.inc 2009-04-18 01:03:01 +0000 +++ payment/uc_credit/uc_credit.admin.inc 2009-04-28 16:39:25 +0000 @@ -9,7 +9,7 @@ // Displays the credit card terminal page. function uc_credit_terminal($order) { - $output = l(t('Return to order view screen.'), 'admin/store/orders/'. $order_id); + $output = l(t('Return to order view screen.'), 'admin/store/orders/'. $order->order_id); $output .= '

'. t('Use this terminal to process credit card payments through your default gateway.') .'

'; === modified file 'payment/uc_cybersource/uc_cybersource.module' --- payment/uc_cybersource/uc_cybersource.module 2009-04-18 01:03:01 +0000 +++ payment/uc_cybersource/uc_cybersource.module 2009-04-28 16:41:05 +0000 @@ -337,7 +337,7 @@ $request['amount'] = $amount; $request['currency'] = $currency; $request['merchantID'] = $merchantID; - $request['orderNumber'] = $order_id; + $request['orderNumber'] = $order->order_id; $request['orderPage_timestamp'] = $timestamp; $request['orderPage_ignoreAVS'] = variable_get('uc_cybersource_avs', 'true') == 'true' ? 'false' : 'true'; $request['orderPage_signaturePublic'] = $pub_digest; === modified file 'payment/uc_recurring/uc_recurring.module' --- payment/uc_recurring/uc_recurring.module 2009-04-24 15:49:55 +0000 +++ payment/uc_recurring/uc_recurring.module 2009-04-28 16:44:08 +0000 @@ -124,6 +124,7 @@ function uc_recurring_form_alter(&$form, &$form_state, $form_id) { // We may need to alter the checkout form to remove invalid payment methods. if ($form_id == 'uc_cart_checkout_form' && isset($form['panes']['payment'])) { + $order = new stdClass(); $order->products = uc_cart_get_contents(); // Make no changes if no recurring fees are found. === modified file 'shipping/uc_shipping/uc_shipping.module' --- shipping/uc_shipping/uc_shipping.module 2009-04-18 01:05:58 +0000 +++ shipping/uc_shipping/uc_shipping.module 2009-04-28 16:45:35 +0000 @@ -225,7 +225,7 @@ $output = ''; $rows = array(); - $output .= '
'. t('Package %id:', array('%id' => $package_id)) .'
'; + $output .= '
'. t('Package %id:', array('%id' => $package->package_id)) .'
'; $rows[] = array(t('Contents:'), filter_xss_admin($package->description)); if ($shipment) { $methods = module_invoke_all('shipping_method'); === modified file 'uc_attribute/uc_attribute.admin.inc' --- uc_attribute/uc_attribute.admin.inc 2009-04-24 15:49:55 +0000 +++ uc_attribute/uc_attribute.admin.inc 2009-04-28 16:46:19 +0000 @@ -407,7 +407,7 @@ function uc_attribute_option_delete_confirm($form_state, $attribute, $option) { if (empty($option)) { drupal_set_message(t('There is no option with that ID.'), 'error'); - drupal_goto('admin/store/attributes/'. $aid .'/options'); + drupal_goto('admin/store/attributes/'. $attribute->aid .'/options'); } $aid = $attribute->aid; $oid = $option->oid; === modified file 'uc_file/uc_file.module' --- uc_file/uc_file.module 2009-04-01 15:17:04 +0000 +++ uc_file/uc_file.module 2009-04-28 16:48:26 +0000 @@ -703,6 +703,8 @@ * Form builder for hook_product_feature */ function uc_file_feature_form($form_state, $node, $feature) { + $form = array(); + if (!is_dir(variable_get('uc_file_base_dir', NULL))) { drupal_set_message(t('A file directory needs to be configured in product feature settings before a file can be selected.', array('!url' => url('admin/store/settings/products/edit/features'))), 'error'); return $form;