civicrm-core.git
20 months agoMerge pull request #25732 from civicrm/5.60
Seamus Lee [Fri, 3 Mar 2023 21:11:58 +0000 (08:11 +1100)]
Merge pull request #25732 from civicrm/5.60

5.60

20 months agoMerge pull request #25728 from mlutfy/core3438
demeritcowboy [Fri, 3 Mar 2023 21:04:19 +0000 (16:04 -0500)]
Merge pull request #25728 from mlutfy/core3438

dev/core#3438 Drupal: Prevent cv fatal if logging before CMS bootstrap

20 months agoMerge pull request #25729 from MegaphoneJon/membership-lookup-fix
Seamus Lee [Fri, 3 Mar 2023 21:02:53 +0000 (08:02 +1100)]
Merge pull request #25729 from MegaphoneJon/membership-lookup-fix

Contribution pages crash for logged-in users when CiviMember is disabled

20 months agoMerge pull request #25727 from totten/master-token-case
Eileen McNaughton [Fri, 3 Mar 2023 19:55:42 +0000 (08:55 +1300)]
Merge pull request #25727 from totten/master-token-case

(dev/core#4137) Tokens - Filters should be HTML-sensitive

20 months agoFix regression on contribution pages when CiviMember is not enabled
Jon Goldberg [Fri, 3 Mar 2023 19:37:50 +0000 (14:37 -0500)]
Fix regression on contribution pages when CiviMember is not enabled

20 months agodev/core#3438 Drupal: Prevent cv fatal if logging before CMS bootstrap
Mathieu Lu [Fri, 3 Mar 2023 14:06:55 +0000 (09:06 -0500)]
dev/core#3438 Drupal: Prevent cv fatal if logging before CMS bootstrap

21 months agoTokens - "|upper" and "|lower" should work differently in text+html
Tim Otten [Fri, 3 Mar 2023 09:38:29 +0000 (01:38 -0800)]
Tokens - "|upper" and "|lower" should work differently in text+html

21 months ago(REF) TokenProcessor - Extract class StandardFilters
Tim Otten [Fri, 3 Mar 2023 09:15:27 +0000 (01:15 -0800)]
(REF) TokenProcessor - Extract class StandardFilters

21 months agoCRM_Utils_XML - Add method filterMarkupText
Tim Otten [Fri, 3 Mar 2023 08:54:08 +0000 (00:54 -0800)]
CRM_Utils_XML - Add method filterMarkupText

21 months agoMerge pull request #25722 from eileenmcnaughton/rec_test
Eileen McNaughton [Fri, 3 Mar 2023 04:36:42 +0000 (17:36 +1300)]
Merge pull request #25722 from eileenmcnaughton/rec_test

Fix in ContributionTest class

21 months agoMerge pull request #25718 from eileenmcnaughton/admin
colemanw [Fri, 3 Mar 2023 03:02:11 +0000 (22:02 -0500)]
Merge pull request #25718 from eileenmcnaughton/admin

dev/core#4153 Extend the fields available for PrimaryContact on search

21 months agoMerge pull request #25721 from demeritcowboy/history-report
Eileen McNaughton [Fri, 3 Mar 2023 02:59:44 +0000 (15:59 +1300)]
Merge pull request #25721 from demeritcowboy/history-report

Pager missing on Aggregate By Relationship civireport

21 months agoFix in ContributionTest class
Eileen McNaughton [Fri, 3 Mar 2023 02:52:40 +0000 (15:52 +1300)]
Fix in ContributionTest class

This fixes a set up bug. The test deals with a recurring contribution where the
tax is involved. The set up creates the recurring with an amount of 500
and the contribution with an amount of 100. This is invalid but because of
a code change that was outside of what is being tested it scrapes through.

This fixes the test to test a valid 100 for each, followed by the recurring
being changed to an override amount ot 200.

21 months agoMerge pull request #25574 from herbdool/core-4127-5
demeritcowboy [Fri, 3 Mar 2023 02:49:24 +0000 (21:49 -0500)]
Merge pull request #25574 from herbdool/core-4127-5

dev/core#4127 move standalone profile modification to userSystem

21 months agodev/core#4127 move standalone profile modification to userSystem
Herb v/d Dool [Wed, 15 Feb 2023 22:18:42 +0000 (17:18 -0500)]
dev/core#4127 move standalone profile modification to userSystem

21 months agoExtend the fields available for PrimaryContact on search
Eileen McNaughton [Thu, 2 Mar 2023 22:55:10 +0000 (11:55 +1300)]
Extend the fields available for PrimaryContact on search

21 months agoMerge pull request #25707 from eileenmcnaughton/tax_error
Seamus Lee [Thu, 2 Mar 2023 22:53:01 +0000 (09:53 +1100)]
Merge pull request #25707 from eileenmcnaughton/tax_error

Fix bug in tax calculation when recurring overrides with a different value

21 months agoMerge pull request #25634 from eileenmcnaughton/except
Tim Otten [Thu, 2 Mar 2023 22:48:32 +0000 (14:48 -0800)]
Merge pull request #25634 from eileenmcnaughton/except

Add new `\Civi\Exception\DBQueryException` & throw that rather than a `PEAR_Exception`

21 months agoMerge pull request #25704 from totten/5.59-token-mismatch
Tim Otten [Thu, 2 Mar 2023 22:45:41 +0000 (14:45 -0800)]
Merge pull request #25704 from totten/5.59-token-mismatch

(dev/core#4147) Add test and fix for various flaky tokens

21 months agoMerge pull request #25689 from eileenmcnaughton/php82_quick_config
Seamus Lee [Thu, 2 Mar 2023 22:05:37 +0000 (09:05 +1100)]
Merge pull request #25689 from eileenmcnaughton/php82_quick_config

Php8.2 stop accessing undefined form Property isQuickConfig in `PriceField:addQuickFormElement`

21 months agomake pager work
demeritcowboy [Thu, 2 Mar 2023 22:02:39 +0000 (17:02 -0500)]
make pager work

21 months agoMerge pull request #25713 from totten/worldregion
Eileen McNaughton [Thu, 2 Mar 2023 19:53:58 +0000 (08:53 +1300)]
Merge pull request #25713 from totten/worldregion

Worldregion - For API-entity-naming, prefer "WorldRegion"

21 months agoApi4 - Rename Worldregion to WorldRegion
Tim Otten [Thu, 2 Mar 2023 08:22:40 +0000 (00:22 -0800)]
Api4 - Rename Worldregion to WorldRegion

21 months agoWorldregion - For API-entity-naming, prefer "WorldRegion"
Tim Otten [Thu, 2 Mar 2023 05:53:53 +0000 (21:53 -0800)]
Worldregion - For API-entity-naming, prefer "WorldRegion"

21 months agoWorldregion - For API-entity-naming, prefer "WorldRegion"
Tim Otten [Thu, 2 Mar 2023 05:53:53 +0000 (21:53 -0800)]
Worldregion - For API-entity-naming, prefer "WorldRegion"

21 months agoMerge pull request #25708 from eileenmcnaughton/nfc
Eileen McNaughton [Thu, 2 Mar 2023 04:03:02 +0000 (17:03 +1300)]
Merge pull request #25708 from eileenmcnaughton/nfc

[NFC] Superficial cleanup in test class

21 months agoMerge pull request #25710 from colemanw/deprecatedGone
Eileen McNaughton [Thu, 2 Mar 2023 03:12:45 +0000 (16:12 +1300)]
Merge pull request #25710 from colemanw/deprecatedGone

Deprecated code removal

21 months ago[NFC] Superficial cleanup in test class
Eileen McNaughton [Thu, 2 Mar 2023 00:06:17 +0000 (13:06 +1300)]
[NFC] Superficial cleanup in test class

21 months agoSet version to 5.61.alpha1
CiviCRM [Thu, 2 Mar 2023 01:32:24 +0000 (01:32 +0000)]
Set version to 5.61.alpha1

21 months agoSet version to 5.60.beta1
CiviCRM [Thu, 2 Mar 2023 01:32:11 +0000 (01:32 +0000)]
Set version to 5.60.beta1

21 months agoDeprecated code removal
Coleman Watts [Thu, 2 Mar 2023 01:19:54 +0000 (20:19 -0500)]
Deprecated code removal

21 months agoFix bug in tax calculation when recurring overrides with a different value
Eileen McNaughton [Wed, 1 Mar 2023 22:48:36 +0000 (11:48 +1300)]
Fix bug in tax calculation when recurring overrides with a different value

21 months agoStyle
Eileen McNaughton [Wed, 1 Mar 2023 22:56:05 +0000 (11:56 +1300)]
Style

21 months agoMerge pull request #25706 from eileenmcnaughton/strict
Eileen McNaughton [Wed, 1 Mar 2023 22:46:58 +0000 (11:46 +1300)]
Merge pull request #25706 from eileenmcnaughton/strict

Stricter typing in Apiv4

21 months agoSigh, and they have colons:
Eileen McNaughton [Wed, 1 Mar 2023 22:21:37 +0000 (11:21 +1300)]
Sigh, and they have colons:

21 months agoFix key mismatch
Eileen McNaughton [Wed, 1 Mar 2023 22:20:16 +0000 (11:20 +1300)]
Fix key mismatch

21 months agoFix preferred_communication method
Eileen McNaughton [Wed, 1 Mar 2023 22:19:02 +0000 (11:19 +1300)]
Fix preferred_communication method

Also fix over-aggressive test assertion

21 months agoFix region token
Eileen McNaughton [Wed, 1 Mar 2023 21:56:43 +0000 (10:56 +1300)]
Fix region token

21 months agoStricter typing in Apiv4
Eileen McNaughton [Wed, 1 Mar 2023 21:49:40 +0000 (10:49 +1300)]
Stricter typing in Apiv4

21 months agoAdd Worldregion api for join
Eileen McNaughton [Wed, 1 Mar 2023 21:47:44 +0000 (10:47 +1300)]
Add Worldregion api for join

21 months agoFix for unresolved state_province
Eileen McNaughton [Wed, 1 Mar 2023 21:47:26 +0000 (10:47 +1300)]
Fix for unresolved state_province

21 months agoMerge pull request #25705 from eileenmcnaughton/dep
colemanw [Wed, 1 Mar 2023 21:03:00 +0000 (16:03 -0500)]
Merge pull request #25705 from eileenmcnaughton/dep

Remove deprecated function calls to Event::del, Membership functions del, OptionValue

21 months agoRename variable - I figured out what it meant
Eileen McNaughton [Wed, 1 Mar 2023 20:09:49 +0000 (09:09 +1300)]
Rename variable - I figured out what it meant

21 months agoAdhere to comment block code standard
Eileen McNaughton [Wed, 1 Mar 2023 20:08:31 +0000 (09:08 +1300)]
Adhere to comment block code standard

Standard is short one liner first:

21 months agoSuperficial test cleanup, protect variable
Eileen McNaughton [Wed, 1 Mar 2023 20:07:37 +0000 (09:07 +1300)]
Superficial test cleanup, protect variable

21 months agoAdd phpdoc to prevent restoreTime being removed
Eileen McNaughton [Wed, 1 Mar 2023 20:05:46 +0000 (09:05 +1300)]
Add phpdoc to prevent restoreTime being removed

These unused variables cause quite a few bugs - keeping them 'matters' but
they look like they can go and people doing that happens moderately often,
causing bugs (this has been the cause of more than one 'locks don't work bug'

21 months agoRemove some calls to OptionValue deleteRecord
Eileen McNaughton [Wed, 1 Mar 2023 19:51:53 +0000 (08:51 +1300)]
Remove some calls to OptionValue deleteRecord

21 months agoDeprecations in Event, Membership
Eileen McNaughton [Wed, 1 Mar 2023 19:48:57 +0000 (08:48 +1300)]
Deprecations in Event, Membership

Per https://github.com/civicrm/civicrm-core/pull/25677

21 months agoStop calling deprectated del function
Eileen McNaughton [Wed, 1 Mar 2023 19:44:34 +0000 (08:44 +1300)]
Stop calling deprectated del function

21 months ago(dev/core#4147) Add scenario testTokensIndividually
Tim Otten [Wed, 1 Mar 2023 09:12:49 +0000 (01:12 -0800)]
(dev/core#4147) Add scenario testTokensIndividually

21 months ago(REF) MessageTemplateTest - Extract method useFrozenTime()
Tim Otten [Wed, 1 Mar 2023 09:10:40 +0000 (01:10 -0800)]
(REF) MessageTemplateTest - Extract method useFrozenTime()

21 months agoMerge pull request #25702 from civicrm/5.59
Eileen McNaughton [Wed, 1 Mar 2023 06:34:22 +0000 (19:34 +1300)]
Merge pull request #25702 from civicrm/5.59

5.59

21 months agoMerge pull request #25698 from colemanw/removeIds
Yashodha Chaku [Wed, 1 Mar 2023 04:42:43 +0000 (10:12 +0530)]
Merge pull request #25698 from colemanw/removeIds

Remove deprecated use of $ids

21 months agoMerge pull request #25701 from alifrumin/5.59rn
Yashodha Chaku [Wed, 1 Mar 2023 04:40:51 +0000 (10:10 +0530)]
Merge pull request #25701 from alifrumin/5.59rn

[NFC] 5.59 release notes sorting and annotating

21 months ago[NFC] 5.59 release notes sorting and annotating
Alice Frumin [Wed, 1 Mar 2023 03:56:11 +0000 (22:56 -0500)]
[NFC] 5.59 release notes sorting and annotating

21 months agoMerge pull request #25699 from civicrm/5.59
Eileen McNaughton [Wed, 1 Mar 2023 02:51:57 +0000 (15:51 +1300)]
Merge pull request #25699 from civicrm/5.59

5.59 to master

21 months agoMerge pull request #25697 from agh1/5.59.0-releasenotes-initial
Eileen McNaughton [Wed, 1 Mar 2023 02:51:34 +0000 (15:51 +1300)]
Merge pull request #25697 from agh1/5.59.0-releasenotes-initial

5.59.0 releasenotes initial run

21 months agoMerge pull request #25639 from eileenmcnaughton/import_validate
Tim Otten [Wed, 1 Mar 2023 01:44:30 +0000 (17:44 -0800)]
Merge pull request #25639 from eileenmcnaughton/import_validate

dev/core#4132 Fix import for multi-custom boxes

21 months agoRemove deprecated use of $ids
Coleman Watts [Wed, 1 Mar 2023 01:32:09 +0000 (20:32 -0500)]
Remove deprecated use of $ids

21 months ago5.59.0 release notes: added boilerplate
Andie Hunt [Wed, 1 Mar 2023 01:26:08 +0000 (20:26 -0500)]
5.59.0 release notes: added boilerplate

21 months ago5.59.0 release notes: raw from script
Andie Hunt [Wed, 1 Mar 2023 01:21:59 +0000 (20:21 -0500)]
5.59.0 release notes: raw from script

21 months agoMerge pull request #25696 from colemanw/delDep
colemanw [Wed, 1 Mar 2023 00:57:11 +0000 (19:57 -0500)]
Merge pull request #25696 from colemanw/delDep

Delete long-deprecated functions

21 months agoMerge pull request #25695 from eileenmcnaughton/CRM/Block
colemanw [Wed, 1 Mar 2023 00:22:38 +0000 (19:22 -0500)]
Merge pull request #25695 from eileenmcnaughton/CRM/Block

Pull over a few more deprecations + blockDelete deprecation

21 months agoDelete long-deprecated functions
Coleman Watts [Wed, 1 Mar 2023 00:04:36 +0000 (19:04 -0500)]
Delete long-deprecated functions

21 months agoPull over a few more deprecations + blockDelete deprecation
Eileen McNaughton [Tue, 28 Feb 2023 23:48:27 +0000 (12:48 +1300)]
Pull over a few more deprecations + blockDelete deprecation

21 months agoMerge pull request #25693 from eileenmcnaughton/CRM/Block
Eileen McNaughton [Tue, 28 Feb 2023 23:45:38 +0000 (12:45 +1300)]
Merge pull request #25693 from eileenmcnaughton/CRM/Block

Address portions of deprecated code replacement

21 months agoAddress portions of deprecated code replacement
Eileen McNaughton [Tue, 28 Feb 2023 22:31:22 +0000 (11:31 +1300)]
Address portions of deprecated code replacement

21 months agoMerge pull request #25691 from eileenmcnaughton/dep_mailing
colemanw [Tue, 28 Feb 2023 22:07:48 +0000 (17:07 -0500)]
Merge pull request #25691 from eileenmcnaughton/dep_mailing

Deprecations for Mailing::delete functions

21 months agoMerge pull request #25690 from eileenmcnaughton/dep_test
Eileen McNaughton [Tue, 28 Feb 2023 21:49:55 +0000 (10:49 +1300)]
Merge pull request #25690 from eileenmcnaughton/dep_test

Deprecations for delete on ACL entities

21 months agoDeprecations for Mailing::delete functions
Eileen McNaughton [Tue, 28 Feb 2023 21:01:23 +0000 (10:01 +1300)]
Deprecations for Mailing::delete functions

21 months agoDeprecations for delete on ACL entities
Eileen McNaughton [Tue, 28 Feb 2023 20:51:03 +0000 (09:51 +1300)]
Deprecations for delete on ACL entities

21 months agoMerge pull request #25688 from eileenmcnaughton/dep_test
Seamus Lee [Tue, 28 Feb 2023 20:10:29 +0000 (07:10 +1100)]
Merge pull request #25688 from eileenmcnaughton/dep_test

Remove deprecated functions from tests

21 months agoPhp8.2 stop accessing undefined form Property isQuickConfig in PriceField:addQuickFor...
Eileen McNaughton [Tue, 28 Feb 2023 19:30:02 +0000 (08:30 +1300)]
Php8.2 stop accessing undefined form Property isQuickConfig in PriceField:addQuickFormElement

21 months agoRemove deprecated functions from tests
Eileen McNaughton [Tue, 28 Feb 2023 18:48:22 +0000 (07:48 +1300)]
Remove deprecated functions from tests

21 months agoMerge pull request #25686 from eileenmcnaughton/dep_2020_address
Eileen McNaughton [Tue, 28 Feb 2023 06:02:16 +0000 (19:02 +1300)]
Merge pull request #25686 from eileenmcnaughton/dep_2020_address

Remove 2020-deprecated handling of `legacyAddressCreate`

21 months agoMerge pull request #25685 from eileenmcnaughton/dep_2020
Yashodha Chaku [Tue, 28 Feb 2023 03:16:00 +0000 (08:46 +0530)]
Merge pull request #25685 from eileenmcnaughton/dep_2020

Remove function noisily deprecated when the world was young (2020)

21 months agoMerge pull request #25684 from eileenmcnaughton/address_delete
Yashodha Chaku [Tue, 28 Feb 2023 03:14:00 +0000 (08:44 +0530)]
Merge pull request #25684 from eileenmcnaughton/address_delete

Remove deprecated function call

21 months agoMerge pull request #25646 from colemanw/fixSearchDisplayFilter
Eileen McNaughton [Tue, 28 Feb 2023 02:28:15 +0000 (15:28 +1300)]
Merge pull request #25646 from colemanw/fixSearchDisplayFilter

Afform - Filter autocomplete fields belonging to a search display

21 months agoRemove 2020-deprecated handline of legacyAddressCreate
Eileen McNaughton [Tue, 28 Feb 2023 02:24:31 +0000 (15:24 +1300)]
Remove 2020-deprecated handline of legacyAddressCreate

21 months agoRemove function noisily deprecated when the world was young (2020)
Eileen McNaughton [Tue, 28 Feb 2023 02:01:49 +0000 (15:01 +1300)]
Remove function noisily deprecated when the world was young (2020)

21 months agoMerge pull request #25669 from eileenmcnaughton/smarty-syntax
demeritcowboy [Tue, 28 Feb 2023 01:53:40 +0000 (20:53 -0500)]
Merge pull request #25669 from eileenmcnaughton/smarty-syntax

dev/core#4146 Remove (old) Smarty-forward incompatible syntax from Address.tpl

21 months agoMerge pull request #25683 from eileenmcnaughton/logging_dep
demeritcowboy [Tue, 28 Feb 2023 01:34:09 +0000 (20:34 -0500)]
Merge pull request #25683 from eileenmcnaughton/logging_dep

Add gentle deprecation to `debug_log_message`

21 months agoMerge pull request #25682 from eileenmcnaughton/log_smarty
demeritcowboy [Tue, 28 Feb 2023 01:25:34 +0000 (20:25 -0500)]
Merge pull request #25682 from eileenmcnaughton/log_smarty

Log Smarty debug to it's own channel

21 months agoMerge pull request #25680 from eileenmcnaughton/smarty-bank
demeritcowboy [Tue, 28 Feb 2023 01:05:03 +0000 (20:05 -0500)]
Merge pull request #25680 from eileenmcnaughton/smarty-bank

Smarty notice fix on bank_account_number

21 months agoRemove deprecated function call
Eileen McNaughton [Tue, 28 Feb 2023 00:54:38 +0000 (13:54 +1300)]
Remove deprecated function call

21 months agoMerge pull request #25678 from eileenmcnaughton/logging-ref
Eileen McNaughton [Tue, 28 Feb 2023 00:50:13 +0000 (13:50 +1300)]
Merge pull request #25678 from eileenmcnaughton/logging-ref

Remove unnecessary pass-by-reference

21 months agoAdd gentle deprecation to debug_log_message
Eileen McNaughton [Tue, 28 Feb 2023 00:47:52 +0000 (13:47 +1300)]
Add gentle deprecation to debug_log_message

21 months agoMerge pull request #25679 from eileenmcnaughton/deprecated_mem_type
colemanw [Tue, 28 Feb 2023 00:47:11 +0000 (19:47 -0500)]
Merge pull request #25679 from eileenmcnaughton/deprecated_mem_type

Remove code deprecated in 2018

21 months agoLog Smarty debug to it's own channel
Eileen McNaughton [Tue, 28 Feb 2023 00:36:47 +0000 (13:36 +1300)]
Log Smarty debug to it's own channel

I just wrote the docs on the right way to log using this example
https://docs.civicrm.org/dev/en/latest/framework/logging/

- so we should make it the same. I tested locally
& this results in the smarty debugging going to a separate file (good).

I personally think we should send all the IPN files off to their
own channel but am loath to be pro-active on changing that

21 months agoSmarty notice fix on bank_account_number
Eileen McNaughton [Mon, 27 Feb 2023 23:48:33 +0000 (12:48 +1300)]
Smarty notice fix on bank_account_number

21 months agoAlso remove CRM_Utils_Array call
Eileen McNaughton [Mon, 27 Feb 2023 23:23:23 +0000 (12:23 +1300)]
Also remove CRM_Utils_Array call

21 months agoRemove code deprecated in 2018
Eileen McNaughton [Mon, 27 Feb 2023 23:19:50 +0000 (12:19 +1300)]
Remove code deprecated in 2018

21 months agoMake function private
Eileen McNaughton [Mon, 27 Feb 2023 23:04:19 +0000 (12:04 +1300)]
Make function private

21 months agoRemove unnecessary pass-by-reference
Eileen McNaughton [Mon, 27 Feb 2023 23:01:52 +0000 (12:01 +1300)]
Remove unnecessary pass-by-reference

21 months agoMerge pull request #25675 from eileenmcnaughton/notice_location
demeritcowboy [Mon, 27 Feb 2023 21:44:16 +0000 (16:44 -0500)]
Merge pull request #25675 from eileenmcnaughton/notice_location

Remove empty on location - it should always be set now

21 months agoRemove empty on location - it should always be set now
Eileen McNaughton [Mon, 27 Feb 2023 19:56:51 +0000 (08:56 +1300)]
Remove empty on location - it should always be set now

See https://github.com/civicrm/civicrm-core/pull/25668

21 months agoMerge pull request #25618 from mattwire/caserelationship
colemanw [Mon, 27 Feb 2023 15:34:25 +0000 (10:34 -0500)]
Merge pull request #25618 from mattwire/caserelationship

Afform: Allow selecting case for relationship

21 months agoMerge pull request #25668 from eileenmcnaughton/notice_location
demeritcowboy [Mon, 27 Feb 2023 13:47:30 +0000 (08:47 -0500)]
Merge pull request #25668 from eileenmcnaughton/notice_location

Fix e-notice pattern around location not defined in formButtons.tpl

21 months agoMerge pull request #25309 from MegaphoneJon/flexmailer-return-path
demeritcowboy [Mon, 27 Feb 2023 13:44:36 +0000 (08:44 -0500)]
Merge pull request #25309 from MegaphoneJon/flexmailer-return-path

closes core#4070 - respect default return path

21 months agoMerge pull request #25585 from herbdool/core-4127-4
demeritcowboy [Mon, 27 Feb 2023 13:40:03 +0000 (08:40 -0500)]
Merge pull request #25585 from herbdool/core-4127-4

dev/core#4127 move cms user parameters to userSystem