| Index: civicrm/trunk/sites/all/modules/thank_you/thank_you.module |
| — | — | @@ -231,9 +231,10 @@ |
| 232 | 232 | return system_settings_form($form); |
| 233 | 233 | } |
| 234 | 234 | |
| 235 | | -function thank_you_queue2civicrm_import( $contribution_id ) { |
| 236 | | - watchdog('thank_you', 'Calling thank you function for contribution: ' . $contribution_id . '<pre>' . check_plain(print_r($message_debug, TRUE)) . '</pre>'); |
| 237 | | - thank_you_send( $contribution_id ); |
| | 235 | +function thank_you_queue2civicrm_import( $contribution_info ) { |
| | 236 | + $contribution_id = $contribution_info[ 'contribution_id' ]; |
| | 237 | + watchdog('thank_you', 'Calling thank you function for contribution: ' . $contribution_id . '<pre>' . check_plain(print_r($message_debug, TRUE)) . '</pre>'); |
| | 238 | + thank_you_send( $contribution_id ); |
| 238 | 239 | } |
| 239 | 240 | |
| 240 | 241 | function thank_you_mail_send($mailkey, $to, $subject, $body, $from = NULL, $headers = array()) { |
| Index: civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm.module |
| — | — | @@ -348,9 +348,16 @@ |
| 349 | 349 | 'contact_id' => $contact['id'] |
| 350 | 350 | ); |
| 351 | 351 | $tag_result = &civicrm_entity_tag_add( $tag ); |
| 352 | | - |
| | 352 | + |
| | 353 | + // construct an array of useful info to invocations of queue2civicrm_import |
| | 354 | + $contribution_info = array( |
| | 355 | + 'contribution_id' => $contribution['id'], |
| | 356 | + 'contact_id' => $contact['id'], |
| | 357 | + 'msg' => $msg, |
| | 358 | + ); |
| | 359 | + |
| 353 | 360 | // Send thank you email, other post-import things |
| 354 | | - module_invoke_all('queue2civicrm_import', $contribution['id']); |
| | 361 | + module_invoke_all( 'queue2civicrm_import', $contribution_info ); |
| 355 | 362 | |
| 356 | 363 | |
| 357 | 364 | return TRUE; |