civicrm-core.git
8 years agoTest for contribution recur edit clobbering currency
Elliott Eggleston [Mon, 8 Aug 2016 18:45:24 +0000 (14:45 -0400)]
Test for contribution recur edit clobbering currency

8 years agoCheck the right next_sched dates for update
Elliott Eggleston [Mon, 8 Aug 2016 18:27:48 +0000 (14:27 -0400)]
Check the right next_sched dates for update

Need to look at $existing, not $params.

8 years agoDon't clobber contributionRecur currency on edit
Elliott Eggleston [Mon, 8 Aug 2016 18:20:48 +0000 (14:20 -0400)]
Don't clobber contributionRecur currency on edit

When editing an existing contribution_recur without specifying a
currency, do not change the record to the default currency.

8 years agoMerge pull request #8835 from eileenmcnaughton/tax_amount
Eileen McNaughton [Mon, 8 Aug 2016 07:48:28 +0000 (19:48 +1200)]
Merge pull request #8835 from eileenmcnaughton/tax_amount

CRM-19126 Tax amount fix

8 years agoMerge pull request #8693 from seamuslee001/CRM-19068
Eileen McNaughton [Mon, 8 Aug 2016 07:47:00 +0000 (19:47 +1200)]
Merge pull request #8693 from seamuslee001/CRM-19068

CRM-19068 Fix SQLI in parents in group.create api call

8 years agoremove redundant second check given that we are now throwing errors
Seamus Lee [Mon, 8 Aug 2016 06:55:36 +0000 (16:55 +1000)]
remove redundant second check given that we are now throwing errors

8 years agoFix up Failing test due to empty parents array. Parents is assumed to be empty unless...
Seamus Lee [Thu, 14 Jul 2016 00:54:57 +0000 (10:54 +1000)]
Fix up Failing test due to empty parents array. Parents is assumed to be empty unless specified

8 years agoSwitch to throwing errrors rather than soft validation
Seamus Lee [Wed, 13 Jul 2016 07:18:14 +0000 (17:18 +1000)]
Switch to throwing errrors rather than soft validation

8 years agoAdd in Test to sort sqli
Seamus Lee [Wed, 13 Jul 2016 04:42:48 +0000 (04:42 +0000)]
Add in Test to sort sqli

8 years agoCRM-19068 Fix SQLI in parents in group.create api call
Seamus Lee [Wed, 13 Jul 2016 04:28:58 +0000 (04:28 +0000)]
CRM-19068 Fix SQLI in parents in group.create api call

8 years agoMerge pull request #8832 from eileenmcnaughton/mail_link
Eileen McNaughton [Mon, 8 Aug 2016 06:39:24 +0000 (18:39 +1200)]
Merge pull request #8832 from eileenmcnaughton/mail_link

CRM-19187 Add link to public mailing

8 years agoCRM-19126 further fix - less aggressive return
eileenmcnaugton [Mon, 8 Aug 2016 06:06:43 +0000 (18:06 +1200)]
CRM-19126 further fix - less aggressive return

8 years agoFix new test
Seamus Lee [Mon, 8 Aug 2016 06:02:10 +0000 (16:02 +1000)]
Fix new test

8 years agoMerge pull request #8834 from seamuslee001/CRM-19191
Eileen McNaughton [Mon, 8 Aug 2016 04:01:10 +0000 (16:01 +1200)]
Merge pull request #8834 from seamuslee001/CRM-19191

CRM-19191 Allow for searching by either contact on Dedupe Exceptions page

8 years agoMerge pull request #8833 from eileenmcnaughton/group_iterator
Eileen McNaughton [Mon, 8 Aug 2016 03:41:06 +0000 (15:41 +1200)]
Merge pull request #8833 from eileenmcnaughton/group_iterator

[NFC] CRM-19068 clean up GroupNesting class

8 years agoEnsure that picks up the updated values following setting tax amount
Seamus Lee [Mon, 8 Aug 2016 03:18:32 +0000 (13:18 +1000)]
Ensure that  picks up the updated values following setting tax amount

8 years agoUpdate test to reflect the groupNesting behaviour.
eileenmcnaugton [Mon, 8 Aug 2016 00:24:07 +0000 (12:24 +1200)]
Update test to reflect the groupNesting behaviour.

The changes mean that a duplicate groupNesting entry will not be created.

This is more correct so lets fix the test to reflect it

8 years agoCRM-19126 load previous values selectively for tax
eileenmcnaugton [Sun, 7 Aug 2016 23:33:17 +0000 (11:33 +1200)]
CRM-19126 load previous values selectively for tax

This includes moving the setting of tax values from the api to the BAO.

Unfortunately an awful lot of the tax work was done in the form layer & it would
be a big job to figure out which parts can be left to the BAO

8 years agoCRM-19126 CRM-19152 Attempt to resurect total amount from previous values rather...
Seamus Lee [Fri, 5 Aug 2016 22:21:25 +0000 (08:21 +1000)]
CRM-19126 CRM-19152 Attempt to resurect total amount from previous values rather than return params

8 years agoFix Syntax Conformance test
Seamus Lee [Sat, 6 Aug 2016 00:52:37 +0000 (10:52 +1000)]
Fix Syntax Conformance test

8 years agoCRM-19068 fix BAO functions to use DAO
eileenmcnaugton [Sun, 7 Aug 2016 21:33:23 +0000 (09:33 +1200)]
CRM-19068 fix BAO functions to use DAO

8 years agoCRM-19068 put back the cacheFlush function for tests.
eileenmcnaugton [Sun, 7 Aug 2016 10:54:09 +0000 (22:54 +1200)]
CRM-19068 put back the cacheFlush function for tests.

I removed a row doing a pointless group delete - but it
turns out it was overloaded with a cache flush - so
reinstating just the cache flush

8 years agoCRM-19068 CRM-8879 remove group iterator & related unused functions
eileenmcnaugton [Sun, 7 Aug 2016 07:59:48 +0000 (19:59 +1200)]
CRM-19068 CRM-8879 remove group iterator & related unused functions

The iterator functionality appears unused and 4 years ago the same
observation was made.

I grepped for each of the functions I removed & tested that searching by
group still works

8 years agoCRM-19068 comment fixes & remove unused variables
eileenmcnaugton [Sun, 7 Aug 2016 07:42:00 +0000 (19:42 +1200)]
CRM-19068 comment fixes & remove unused variables

8 years agoCRM-19068 remove references to 'descendant groups for an org'
eileenmcnaugton [Sun, 7 Aug 2016 07:37:41 +0000 (19:37 +1200)]
CRM-19068 remove references to 'descendant groups for an org'

A grep on this only finds it in the legacy version of the multisite
extension

8 years agoMerge pull request #8773 from eileenmcnaughton/syntax
Eileen McNaughton [Sun, 7 Aug 2016 22:09:47 +0000 (10:09 +1200)]
Merge pull request #8773 from eileenmcnaughton/syntax

CRM-18563 Check for API exception when testing create without params

8 years agoMerge pull request #8825 from joseltorres/crm-19150
Eileen McNaughton [Sun, 7 Aug 2016 21:47:11 +0000 (09:47 +1200)]
Merge pull request #8825 from joseltorres/crm-19150

CRM-19150 Preserve contribution when associated membership is deleted

8 years agoCRM-19191 Allow for searching by either contact
Seamus Lee [Sun, 7 Aug 2016 07:51:59 +0000 (07:51 +0000)]
CRM-19191 Allow for searching by either contact

8 years agoMerge pull request #8516 from mlutfy/master-crm18756-2
Eileen McNaughton [Sun, 7 Aug 2016 06:56:38 +0000 (18:56 +1200)]
Merge pull request #8516 from mlutfy/master-crm18756-2

CRM-18756: TrackableURLOpen: fix SQL parameter escaping convention.

8 years agojenkins take that!
eileenmcnaugton [Sat, 6 Aug 2016 08:12:36 +0000 (20:12 +1200)]
jenkins take that!

8 years agoCRM-19187 Add link to public mailing
eileenmcnaugton [Sat, 6 Aug 2016 06:33:32 +0000 (18:33 +1200)]
CRM-19187 Add link to public mailing

Links are now on the Report page & the browse link drop-down.

They only show if the visibility is Public

8 years agoMerge pull request #8830 from colemanw/debugTpl
colemanw [Sat, 6 Aug 2016 03:40:36 +0000 (23:40 -0400)]
Merge pull request #8830 from colemanw/debugTpl

Remove debugging comment when not in debug mode

8 years agoRemove debugging comment when not in debug mode
Coleman Watts [Fri, 5 Aug 2016 16:30:23 +0000 (12:30 -0400)]
Remove debugging comment when not in debug mode

8 years agoMerge pull request #8828 from jitendrapurohit/CRM-19183
Monish Deb [Fri, 5 Aug 2016 13:07:54 +0000 (18:37 +0530)]
Merge pull request #8828 from jitendrapurohit/CRM-19183

CRM-19183 - Remove .pdf extension for dompdf

8 years agoMerge pull request #8827 from jitendrapurohit/CRM-19176
Yashodha Chaku [Fri, 5 Aug 2016 11:08:13 +0000 (16:38 +0530)]
Merge pull request #8827 from jitendrapurohit/CRM-19176

CRM-19176 - Additional fixes

8 years agoCRM-19183 - Remove .pdf extension for dompdf
jitendrapurohit [Fri, 5 Aug 2016 10:57:21 +0000 (16:27 +0530)]
CRM-19183 - Remove .pdf extension for dompdf

8 years agoCRM-19176 - Additional fixes
jitendrapurohit [Fri, 5 Aug 2016 10:11:49 +0000 (15:41 +0530)]
CRM-19176 - Additional fixes

8 years agoMerge pull request #8826 from monishdeb/CRM-19182
Monish Deb [Fri, 5 Aug 2016 10:08:27 +0000 (15:38 +0530)]
Merge pull request #8826 from monishdeb/CRM-19182

CRM-19182: Fatal Error while printing 'Thank-you Letter for Contributions (PDF)'

8 years agoMerge pull request #8804 from yosefromano/master
Yashodha Chaku [Fri, 5 Aug 2016 09:16:29 +0000 (14:46 +0530)]
Merge pull request #8804 from yosefromano/master

CRM-19176 Add grouping options for contribution thank you letters

8 years agoCRM-19182: Fatal Error while printing 'Thank-you Letter for Contributions (PDF)'
deb.monish [Fri, 5 Aug 2016 07:09:56 +0000 (12:39 +0530)]
CRM-19182: Fatal Error while printing 'Thank-you Letter for Contributions (PDF)'

8 years agofixed file permission issues
joseltorres [Thu, 4 Aug 2016 15:45:01 +0000 (08:45 -0700)]
fixed file permission issues

8 years agomade BAO if statements true booleans instead of 0/1 intergers
joseltorres [Wed, 3 Aug 2016 22:03:25 +0000 (15:03 -0700)]
made BAO if statements true booleans instead of 0/1 intergers

8 years agoAPI test fix, added title, desc, type to new api param for Membership Delete.
Jose Torres [Wed, 3 Aug 2016 17:48:45 +0000 (10:48 -0700)]
API test fix, added title, desc, type to new api param for Membership Delete.

8 years agocode style fix
Jose Torres [Wed, 3 Aug 2016 16:42:36 +0000 (09:42 -0700)]
code style fix

8 years agocrm-19150 Preserve contribution when associated membership is deleted (step 1 of...
Jose Torres [Wed, 3 Aug 2016 16:38:26 +0000 (09:38 -0700)]
crm-19150 Preserve contribution when associated membership is deleted (step 1 of 2 | API and BAO)

8 years agoMerge pull request #8822 from jitendrapurohit/CRM-19171
Monish Deb [Thu, 4 Aug 2016 12:58:49 +0000 (18:28 +0530)]
Merge pull request #8822 from jitendrapurohit/CRM-19171

CRM-19171 - Avoid clearing radio/checkbox values while form reset

8 years agoMerge pull request #8814 from twomice/CRM-19173
Monish Deb [Thu, 4 Aug 2016 12:22:21 +0000 (17:52 +0530)]
Merge pull request #8814 from twomice/CRM-19173

CRM-19173: Strip Bcc header.

8 years agoCRM-19171 - Avoid clearing radio/checkbox values while form reset
jitendrapurohit [Thu, 4 Aug 2016 12:10:38 +0000 (17:40 +0530)]
CRM-19171 - Avoid clearing radio/checkbox values while form reset

8 years agoMerge pull request #8809 from monishdeb/CRM-19166
Monish Deb [Thu, 4 Aug 2016 12:02:43 +0000 (17:32 +0530)]
Merge pull request #8809 from monishdeb/CRM-19166

CRM-19166: Find Contributions Send Email notice errors

8 years agoMerge pull request #8818 from seamuslee001/CRM-19177
Yashodha Chaku [Thu, 4 Aug 2016 09:29:13 +0000 (14:59 +0530)]
Merge pull request #8818 from seamuslee001/CRM-19177

CRM-19177 Add in privacy flags to the output of print contact records

8 years agoMerge pull request #8805 from eileenmcnaughton/reports
Yashodha Chaku [Thu, 4 Aug 2016 08:05:04 +0000 (13:35 +0530)]
Merge pull request #8805 from eileenmcnaughton/reports

CRM-19167 add is_deceased filter to contact reports

8 years agoFix LocBlock Test
Seamus Lee [Wed, 3 Aug 2016 09:31:38 +0000 (19:31 +1000)]
Fix LocBlock Test

8 years agoFix mailing test and allow for name or label to be used in navigation as that seems...
Seamus Lee [Wed, 3 Aug 2016 08:59:27 +0000 (18:59 +1000)]
Fix mailing test and allow for name or label to be used in navigation as that seems to be allowable

8 years agoFix up navigation test - SL
Seamus Lee [Wed, 3 Aug 2016 07:23:44 +0000 (17:23 +1000)]
Fix up navigation test - SL

8 years agoCRM-18563 Some fixes for the fails in new test.
eileen [Wed, 27 Jul 2016 21:45:20 +0000 (09:45 +1200)]
CRM-18563 Some fixes for the fails in new test.

8 years agoCheck for API exception when testing create without params.
Mattias Michaux [Mon, 16 May 2016 20:01:48 +0000 (22:01 +0200)]
Check for API exception when testing create without params.

8 years agoTypo fix
eileen [Wed, 27 Jul 2016 20:54:05 +0000 (08:54 +1200)]
Typo fix

8 years agoCRM-19177 Add in privacy flags to the output of print contact records
Seamus Lee [Thu, 4 Aug 2016 05:32:08 +0000 (15:32 +1000)]
CRM-19177 Add in privacy flags to the output of print contact records

8 years agoMerge pull request #8467 from eileenmcnaughton/groups
Eileen McNaughton [Wed, 3 Aug 2016 23:48:59 +0000 (11:48 +1200)]
Merge pull request #8467 from eileenmcnaughton/groups

CRM-18683 smart group caching fixes (CRM-18683 CRM-18692 CRM-18695)

8 years agoCRM-18692 issue warning about empty smart group cache rather than crash the server
eileenmcnaugton [Sun, 29 May 2016 22:19:05 +0000 (10:19 +1200)]
CRM-18692 issue warning about empty smart group cache rather than crash the server

8 years agoCRM-18683 don't use non transaction-safe function to clear smart group cache.
eileenmcnaugton [Sun, 29 May 2016 22:15:44 +0000 (10:15 +1200)]
CRM-18683 don't use non transaction-safe function to clear smart group cache.

Note that there is a function elsewhere that allows the code to use truncate where there is no transaction.

I have left that possibility for future consideration as there is some debate over whether truncate is faster on all sites

8 years agoCRM-19173: Strip Bcc header.
Allen Shaw [Wed, 3 Aug 2016 17:20:34 +0000 (12:20 -0500)]
CRM-19173: Strip Bcc header.

8 years agoMerge pull request #8730 from JMAConsulting/CRM-16189-41
Joe Murray [Wed, 3 Aug 2016 16:22:46 +0000 (12:22 -0400)]
Merge pull request #8730 from JMAConsulting/CRM-16189-41

[ready-for-core-team-review]CRM-16189, fixed code to check if financial type id is present in $pa…

8 years agoMerge pull request #8806 from mlutfy/master-crm19168
Monish Deb [Wed, 3 Aug 2016 09:57:11 +0000 (15:27 +0530)]
Merge pull request #8806 from mlutfy/master-crm19168

CRM-19168: Fix membership batch update with profiles that have custom date fields.

8 years agoCRM-19166: Find Contributions Send Email notice errors
deb.monish [Wed, 3 Aug 2016 07:01:37 +0000 (12:31 +0530)]
CRM-19166: Find Contributions Send Email notice errors

8 years agoMerge pull request #8779 from jitendrapurohit/CRM-19128
Eileen McNaughton [Wed, 3 Aug 2016 06:26:54 +0000 (18:26 +1200)]
Merge pull request #8779 from jitendrapurohit/CRM-19128

CRM-19128 - set default filter to Contributions only

8 years agoCRM-18060 fix campaign e-notice on lybunt
eileen [Wed, 3 Aug 2016 00:34:04 +0000 (12:34 +1200)]
CRM-18060 fix campaign e-notice on lybunt

8 years agoCRM-19168: Fix membership batch update with profiles that have custom date fields.
Mathieu Lutfy [Tue, 2 Aug 2016 23:15:27 +0000 (19:15 -0400)]
CRM-19168: Fix membership batch update with profiles that have custom date fields.

8 years agoCRM-19167 add is_deceased filter to employee report
eileen [Tue, 2 Aug 2016 22:47:20 +0000 (10:47 +1200)]
CRM-19167 add is_deceased filter to employee report

8 years agoCRM-19167 add is_deceased filter to contact detail report
eileen [Tue, 2 Aug 2016 22:42:06 +0000 (10:42 +1200)]
CRM-19167 add is_deceased filter to contact detail report

8 years agoCRM-19167 add is_deceased filter to contact summary report
eileen [Tue, 2 Aug 2016 22:38:37 +0000 (10:38 +1200)]
CRM-19167 add is_deceased filter to contact summary report

8 years agoAdd grouping options for contribution thank you letters
Yosef Romano [Tue, 2 Aug 2016 22:21:12 +0000 (15:21 -0700)]
Add grouping options for contribution thank you letters

8 years agoAdd grouping options for contribution thank you letters
Yosef Romano [Tue, 2 Aug 2016 21:51:14 +0000 (14:51 -0700)]
Add grouping options for contribution thank you letters

8 years agoMerge pull request #8797 from eileenmcnaughton/super_fn
Monish Deb [Tue, 2 Aug 2016 19:10:15 +0000 (00:40 +0530)]
Merge pull request #8797 from eileenmcnaughton/super_fn

CRM-19165 Use permission sensitive function to create strip-numeric f…

8 years agoMerge pull request #8795 from seamuslee001/CRM-19126
Monish Deb [Tue, 2 Aug 2016 19:07:02 +0000 (00:37 +0530)]
Merge pull request #8795 from seamuslee001/CRM-19126

CRM-19126 & CRM-19152 add test to prove that tax_amount gets reset on the complet…

8 years agoMerge pull request #8783 from litespeedmarc/master
Monish Deb [Tue, 2 Aug 2016 14:32:18 +0000 (20:02 +0530)]
Merge pull request #8783 from litespeedmarc/master

CRM-19126: civicrm_line_item.tax_amount incorrectly set when using on…

8 years agoMerge pull request #8269 from monishdeb/CRM-18427
Monish Deb [Tue, 2 Aug 2016 07:33:44 +0000 (13:03 +0530)]
Merge pull request #8269 from monishdeb/CRM-18427

CRM-18427: Submitted custom data values not reloaded on form when validation fails

8 years agoMerge pull request #8782 from jitendrapurohit/CRM-18698
Yashodha Chaku [Tue, 2 Aug 2016 07:02:52 +0000 (12:32 +0530)]
Merge pull request #8782 from jitendrapurohit/CRM-18698

CRM-18698 - Fix cid when reassigning case roles

8 years agoCRM-19165 Use permission sensitive function to create strip-numeric function
eileen [Tue, 2 Aug 2016 02:42:36 +0000 (14:42 +1200)]
CRM-19165 Use permission sensitive function to create strip-numeric function

8 years agoMerge pull request #8586 from JMAConsulting/CRM-16189-17
colemanw [Mon, 1 Aug 2016 23:04:28 +0000 (19:04 -0400)]
Merge pull request #8586 from JMAConsulting/CRM-16189-17

[ready-for-core-team-review]CRM-16189, added code to validate financial type for contribution

8 years agoMerge pull request #8732 from JMAConsulting/CRM-16189-42
Joe Murray [Mon, 1 Aug 2016 21:56:40 +0000 (17:56 -0400)]
Merge pull request #8732 from JMAConsulting/CRM-16189-42

[ready-for-core-team-review]CRM-16189, added hook to alter deferred revenue items

8 years agoCRM-19126: civicrm_line_item.tax_amount incorrectly set when using online payment...
litspeedmarc [Mon, 1 Aug 2016 14:35:50 +0000 (10:35 -0400)]
CRM-19126: civicrm_line_item.tax_amount incorrectly set when using online payment processor

8 years agoMerge pull request #8757 from seamuslee001/CRM-19129
Monish Deb [Mon, 1 Aug 2016 13:20:16 +0000 (18:50 +0530)]
Merge pull request #8757 from seamuslee001/CRM-19129

CRM-19129 Allow Users to Select the From Address used for when sendin…

8 years agoMerge pull request #8712 from totten/master-wordrep
Monish Deb [Mon, 1 Aug 2016 12:54:29 +0000 (18:24 +0530)]
Merge pull request #8712 from totten/master-wordrep

CRM-18513 - WordReplacements - Load en_US when locale is unspecified

8 years agoremove duplicate code
Seamus Lee [Mon, 1 Aug 2016 12:21:17 +0000 (22:21 +1000)]
remove duplicate code

8 years agoReset contactIds variable as gets set incorrectly in preProcessFromAddress
Seamus Lee [Mon, 1 Aug 2016 12:09:59 +0000 (22:09 +1000)]
Reset contactIds variable as gets set incorrectly in preProcessFromAddress

8 years agoFix up cleaning out array of from emails and avoid execption as found by Jitendra
Seamus Lee [Mon, 1 Aug 2016 11:30:30 +0000 (21:30 +1000)]
Fix up cleaning out array of from emails and avoid execption as found by Jitendra

8 years agoCRM-19129 Fix issue where no contact emails are found and split out generating of...
Seamus Lee [Sat, 30 Jul 2016 00:13:52 +0000 (10:13 +1000)]
CRM-19129 Fix issue where no contact emails are found and split out generating of domain emails into own function so can be tested

8 years agoRemove duplicated code and add a note about what this is all about
Seamus Lee [Fri, 29 Jul 2016 21:14:12 +0000 (07:14 +1000)]
Remove duplicated code and add a note about what this is all about

8 years agoCRM-19129 Allow Users to Select the From Address used for when sending Email Receipts
Seamus Lee [Tue, 26 Jul 2016 04:28:27 +0000 (14:28 +1000)]
CRM-19129 Allow Users to Select the From Address used for when sending Email Receipts

8 years agoCRM-19126 add test to prove that tax_amount gets reset on the complete transaction...
Seamus Lee [Mon, 1 Aug 2016 10:27:04 +0000 (20:27 +1000)]
CRM-19126 add test to prove that tax_amount gets reset on the complete transaction call when total amount is not specified

8 years agoMerge pull request #8733 from PalanteJon/CRM-19111
Monish Deb [Mon, 1 Aug 2016 10:26:40 +0000 (15:56 +0530)]
Merge pull request #8733 from PalanteJon/CRM-19111

CRM-19111 - Incoming Email-to-Activity - don't fail on blank email body

8 years agoMerge pull request #8794 from totten/master-getContactGroup
Eileen McNaughton [Mon, 1 Aug 2016 06:02:19 +0000 (18:02 +1200)]
Merge pull request #8794 from totten/master-getContactGroup

CRM-18472 - CRM_Contact_BAO_GroupContact - Remove erroneous references

8 years agoCRM-18472 - CRM_Contact_BAO_GroupContact - Remove erroneous references
Tim Otten [Mon, 1 Aug 2016 02:47:31 +0000 (19:47 -0700)]
CRM-18472 - CRM_Contact_BAO_GroupContact - Remove erroneous references

These lines are attempting to accept a return-value by reference, but the
function does not return by reference. In PHP 5.3+, this is effectively
not a reference; and in PHP 5.4+, it generates a warning. That leads
to test failures in CRM_Contact_BAO_ContactTest::testCreateProfileContact.

8 years agoMerge pull request #8792 from totten/master-setDefaultCallback
Tim Otten [Mon, 1 Aug 2016 01:35:29 +0000 (18:35 -0700)]
Merge pull request #8792 from totten/master-setDefaultCallback

CRM-17789 - CRM_Core_Error - Adjust setDefaultCallback() sig

8 years agoCRM-17789 - CRM_Core_Error - Adjust setDefaultCallback() sig
Tim Otten [Mon, 1 Aug 2016 00:58:02 +0000 (17:58 -0700)]
CRM-17789 - CRM_Core_Error - Adjust setDefaultCallback() sig

The definitions of PEAR_ErrorStack::setDefaultCallback() are slightly
different in PEAR 1.9.0 and PEAR 1.10.0.  The older one is *implicitly*
static (which, in some deployments of PHP, produces a warning); while the
newer one is *explicitly* static.

This code should work with either signature without warnings.

8 years agoMerge pull request #8790 from totten/master-php7-syntax
Tim Otten [Sat, 30 Jul 2016 03:02:34 +0000 (20:02 -0700)]
Merge pull request #8790 from totten/master-php7-syntax

CRM-17789 - PHP 7 - Cherrypick syntax fixes

8 years agoFixed additional php7 incompatible code + correctly called parent constructors.
Mattias Michaux [Wed, 25 May 2016 19:20:37 +0000 (21:20 +0200)]
Fixed additional php7 incompatible code + correctly called parent constructors.

8 years agoFix e-notice on CRM-19111
Jon goldberg [Fri, 29 Jul 2016 21:41:44 +0000 (17:41 -0400)]
Fix e-notice on CRM-19111

8 years agoCRM-19126: civicrm_line_item.tax_amount incorrectly set when using online payment...
litspeedmarc [Fri, 29 Jul 2016 13:20:46 +0000 (09:20 -0400)]
CRM-19126: civicrm_line_item.tax_amount incorrectly set when using online payment processor