projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 39bc405 1524a00)
Merge pull request #7470 from eileenmcnaughton/minor-tidy
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 4 Jan 2016 20:23:23 +0000 (09:23 +1300)
committerEileen McNaughton <eileen@mcnaughty.com>
Mon, 4 Jan 2016 20:23:23 +0000 (09:23 +1300)
Minor tidy up - pass through 'cancel' rather than leave as unintuitiv…

1  2 
CRM/Contribute/BAO/Contribution.php patch | diff1 | diff2 | blob | history
CRM/Contribute/Form/CancelSubscription.php patch | diff1 | diff2 | blob | history
CRM/Core/Payment.php patch | diff1 | diff2 | blob | history
CRM/Core/Payment/ProcessorForm.php patch | diff1 | diff2 | blob | history
CRM/Member/BAO/Membership.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Contribute/BAO/Contribution.php
Simple merge
diff --cc CRM/Core/Payment.php
index f8964c52a64dc2edcde1655b1ab07528c97944c6,a10496a4e2d04bc560b66be4cab3e566f9056c7b..b8792f60c7b3320c95d360fe82a69fce2ebf4709
mode 100755,100644..100755
--- 1/CRM/Core/Payment.php
--- 2/CRM/Core/Payment.php
+++ b/CRM/Core/Payment.php
diff --cc CRM/Core/Payment/ProcessorForm.php
index b63d964646ccd5a1b9343f5138639b3610fc484e,f63b4b6a2d60d2707137d21f0f6ca9f8a0c36733..adcd41cf5aa9dc8a3c4b7fcccd83c2522dcafa4b
mode 100755,100644..100755
--- 1/CRM/Core/Payment/ProcessorForm.php
--- 2/CRM/Core/Payment/ProcessorForm.php
+++ b/CRM/Core/Payment/ProcessorForm.php
diff --cc CRM/Member/BAO/Membership.php
Simple merge