CRM-7139 Respect hook_token for contribution receipts

Sorry,

Patch causes CiviCRM to respect tokens SET VIA HOOK when sending out civicrm receipts

Sorry - try this - difference is not using $tokens here

@@ -399,6 +408,10 @@
$mailing->body_text = $text;
$mailing->body_html = $html;
$tokens = $mailing->getTokens();
+ // get list of categories for hook calls
+ $hooktokens = array();
+ CRM_Utils_Hook::tokens( $hooktokens );
+ $categories = array_keys( $hooktokens );

Rest is whitespace clean up which my editor keeps removing. I did keep re-adding it to clean up the patch but really - it wouldn't hurt to lose the spaces at the end of the lines would it? Save me 10 minutes each time I cut the patch...

Tested r30989.

Failed to apply the patch here on 3.2.5

$ cat new.patch |patch -p1
(Stripping trailing CRs from patch.)
patching file Core/BAO/MessageTemplates.php
Hunk #1 FAILED at 74.
Hunk #2 FAILED at 190.
Hunk #3 FAILED at 202.
Hunk #4 FAILED at 213.
Hunk #5 FAILED at 257.
Hunk #6 FAILED at 399.
Hunk #7 FAILED at 428.
7 out of 7 hunks FAILED – saving rejects to file Core/BAO/MessageTemplates.php.rej

My mistake! patch -p0 not -p1 sorry its late also testing.

Have tried both patches but does not seem to be functioning correctly

My custom module is such..

=============== snip ==============

function civi_custom_membership_civicrm_tokens( &$tokens ) {
touch('/tmp/hook.tokens');
$tokens['test'] = array( 'test.hello' );
}

function civi_custom_membership_civicrm_tokenValues( &$values, &$contactIDs, $jobID ) {
touch('/tmp/hook.tokenValues');
if ( is_array( $contactIDs ) ) {
$contactIDString = implode( ',', array_values( $contactIDs ) );
$single = false;
foreach ($contactIDs as $contact)

} else

}
=============== snip ==============

When this runs, i get the two files in /tmp that shows the hook is being called correctly, however {$test.hello} in my template is never populated