civicrm-core.git
22 months agoMerge pull request #25290 from civicrm/5.58
demeritcowboy [Fri, 6 Jan 2023 21:41:40 +0000 (16:41 -0500)]
Merge pull request #25290 from civicrm/5.58

5.58

22 months agoMerge pull request #25289 from demeritcowboy/sk-update
demeritcowboy [Fri, 6 Jan 2023 19:21:27 +0000 (14:21 -0500)]
Merge pull request #25289 from demeritcowboy/sk-update

searchkit - fix broken update task in dropdown

22 months agofix broken update task
demeritcowboy [Fri, 6 Jan 2023 17:56:14 +0000 (12:56 -0500)]
fix broken update task

22 months agoMerge pull request #25277 from jmcclelland/pcp-anon-redirect
Yashodha Chaku [Fri, 6 Jan 2023 11:24:50 +0000 (16:54 +0530)]
Merge pull request #25277 from jmcclelland/pcp-anon-redirect

avoid empty error message when submitting PCP page.

22 months agoMerge pull request #25283 from demeritcowboy/testname
Tim Otten [Fri, 6 Jan 2023 06:02:11 +0000 (22:02 -0800)]
Merge pull request #25283 from demeritcowboy/testname

[NFC] Test classname should match filename

22 months agoMerge pull request #25251 from eileenmcnaughton/event_info
Yashodha Chaku [Thu, 5 Jan 2023 07:17:30 +0000 (12:47 +0530)]
Merge pull request #25251 from eileenmcnaughton/event_info

Unconditionally assign `registerClosed` on event info page

22 months agoSet version to 5.59.alpha1
Tim Otten [Thu, 5 Jan 2023 05:57:18 +0000 (21:57 -0800)]
Set version to 5.59.alpha1

22 months agoSet version to 5.58.beta1
Tim Otten [Thu, 5 Jan 2023 05:57:00 +0000 (21:57 -0800)]
Set version to 5.58.beta1

22 months agoclassname should match filename
demeritcowboy [Thu, 5 Jan 2023 05:01:53 +0000 (00:01 -0500)]
classname should match filename

22 months agoMerge pull request #25281 from seamuslee001/move_help_test
Tim Otten [Thu, 5 Jan 2023 03:13:35 +0000 (19:13 -0800)]
Merge pull request #25281 from seamuslee001/move_help_test

Move newly added Help Test to Inline folder to match Core Folder stru…

22 months agoMove newly added Help Test to Inline folder to match Core Folder structure
Seamus Lee [Thu, 5 Jan 2023 00:52:58 +0000 (11:52 +1100)]
Move newly added Help Test to Inline folder to match Core Folder structure

22 months agoMerge pull request #25280 from civicrm/5.57
Seamus Lee [Thu, 5 Jan 2023 00:45:13 +0000 (11:45 +1100)]
Merge pull request #25280 from civicrm/5.57

5.57

22 months agorelease-notes/5.57.0.md - Add security advisories
Tim Otten [Wed, 4 Jan 2023 02:32:08 +0000 (18:32 -0800)]
release-notes/5.57.0.md - Add security advisories

22 months agoAssetBuilder - Validate checksum for requested parameters
Tim Otten [Wed, 29 Jun 2022 05:06:05 +0000 (22:06 -0700)]
AssetBuilder - Validate checksum for requested parameters

22 months agoCiviEvent - Escape parameters in help text
Seamus Lee [Tue, 3 Jan 2023 01:54:11 +0000 (12:54 +1100)]
CiviEvent - Escape parameters in help text

22 months agosecurity/core#120 Use Rich's patch (ArtfulRobot) with minor variation to try to resol...
Seamus Lee [Fri, 16 Dec 2022 00:55:57 +0000 (11:55 +1100)]
security/core#120 Use Rich's patch (ArtfulRobot) with minor variation to try to resolve the issue and add unit tests

Fix Regex and include test cases as per Rich's comments

22 months agoMerge pull request #25170 from demeritcowboy/sortable
Tim Otten [Thu, 5 Jan 2023 00:35:26 +0000 (16:35 -0800)]
Merge pull request #25170 from demeritcowboy/sortable

dev/core#4013 dev/core#4022 - Broken quicksearch options setting

22 months agoMerge pull request #25222 from eileenmcnaughton/cust_ed4
demeritcowboy [Wed, 4 Jan 2023 22:34:17 +0000 (17:34 -0500)]
Merge pull request #25222 from eileenmcnaughton/cust_ed4

[REF] [merge custom fields] Only call function when applicable  (well tested code)

22 months agoMerge pull request #25278 from totten/5.57-rn
Tim Otten [Wed, 4 Jan 2023 20:59:26 +0000 (12:59 -0800)]
Merge pull request #25278 from totten/5.57-rn

release-notes/5.57.0.md - Add recent update

22 months agorelease-notes/5.57.0.md - Add recent update
Tim Otten [Wed, 4 Jan 2023 20:58:20 +0000 (12:58 -0800)]
release-notes/5.57.0.md - Add recent update

22 months agoMerge pull request #25276 from demeritcowboy/turk
Eileen McNaughton [Wed, 4 Jan 2023 20:40:57 +0000 (09:40 +1300)]
Merge pull request #25276 from demeritcowboy/turk

[NFC] Restore locale properly after test

22 months agoOnly call function when applicable
Eileen McNaughton [Mon, 26 Dec 2022 22:15:29 +0000 (11:15 +1300)]
Only call function when applicable

Big whitespace change as IF is moved

22 months agoavoid empty error message when submitting PCP page.
Jamie McClelland [Wed, 4 Jan 2023 16:31:05 +0000 (11:31 -0500)]
avoid empty error message when submitting PCP page.

22 months agoMerge pull request #25245 from braders/php82_ical_dynamic_properties
demeritcowboy [Wed, 4 Jan 2023 15:40:17 +0000 (10:40 -0500)]
Merge pull request #25245 from braders/php82_ical_dynamic_properties

[REF][PHP8.2] Avoid dynamic properties in CRM_Activity_BAO_ICalendar

22 months agoMerge pull request #25260 from eileenmcnaughton/prev_o
Yashodha Chaku [Wed, 4 Jan 2023 06:51:47 +0000 (12:21 +0530)]
Merge pull request #25260 from eileenmcnaughton/prev_o

Remove Mar 2020 deprecated functions

22 months agorestore properly
demeritcowboy [Wed, 4 Jan 2023 03:08:54 +0000 (22:08 -0500)]
restore properly

22 months agoMerge pull request #25264 from eileenmcnaughton/leg_selector
Seamus Lee [Wed, 4 Jan 2023 00:31:16 +0000 (11:31 +1100)]
Merge pull request #25264 from eileenmcnaughton/leg_selector

Move legacy search selector file to legacy search extension

22 months agoMerge pull request #25275 from mlutfy/petitionMsgTypo
Seamus Lee [Wed, 4 Jan 2023 00:30:46 +0000 (11:30 +1100)]
Merge pull request #25275 from mlutfy/petitionMsgTypo

Petition ThankYou.tpl: fix strong typo

22 months agoPetition ThankYou.tpl: fix strong typo
Mathieu Lutfy [Tue, 3 Jan 2023 21:47:17 +0000 (16:47 -0500)]
Petition ThankYou.tpl: fix strong typo

22 months agoMerge pull request #25274 from civicrm/5.57
Eileen McNaughton [Tue, 3 Jan 2023 20:51:02 +0000 (09:51 +1300)]
Merge pull request #25274 from civicrm/5.57

5.57 to master

22 months agoMerge pull request #25273 from gellweiler/5.57
Eileen McNaughton [Tue, 3 Jan 2023 20:50:19 +0000 (09:50 +1300)]
Merge pull request #25273 from gellweiler/5.57

Add gellweiler to contributor-key.yml

22 months agoMerge pull request #25272 from eileenmcnaughton/557
Eileen McNaughton [Tue, 3 Jan 2023 20:49:42 +0000 (09:49 +1300)]
Merge pull request #25272 from eileenmcnaughton/557

dev/core#4049 Nested tags are not showing under some circumstances.

22 months agoAdd gellweiler to contributor-key.yml
Sebastian Gellweiler [Tue, 3 Jan 2023 20:18:07 +0000 (21:18 +0100)]
Add gellweiler to contributor-key.yml

22 months agoFix #4049
gellweiler [Sat, 24 Dec 2022 13:51:00 +0000 (14:51 +0100)]
Fix #4049

This commit fixes #4049: Nested tags are not showing under some circumstances.

22 months agoMerge pull request #25268 from eileenmcnaughton/is_separate
Yashodha Chaku [Tue, 3 Jan 2023 04:47:23 +0000 (10:17 +0530)]
Merge pull request #25268 from eileenmcnaughton/is_separate

Remove unreachable code (since 2020)

22 months agoMerge pull request #25258 from eileenmcnaughton/search_test
Seamus Lee [Tue, 3 Jan 2023 00:54:42 +0000 (11:54 +1100)]
Merge pull request #25258 from eileenmcnaughton/search_test

NFC cleanup in test class

22 months agoMerge pull request #25269 from demeritcowboy/more-better-deleted
Seamus Lee [Tue, 3 Jan 2023 00:52:03 +0000 (11:52 +1100)]
Merge pull request #25269 from demeritcowboy/more-better-deleted

Better fix for is_deleted notice in 25261

22 months agoMerge pull request #25267 from eileenmcnaughton/no_input
Seamus Lee [Mon, 2 Jan 2023 22:08:16 +0000 (09:08 +1100)]
Merge pull request #25267 from eileenmcnaughton/no_input

Move part of deprecated function `loadRelatedObjects` to calling functions

22 months agobetter fix for 25261
demeritcowboy [Mon, 2 Jan 2023 22:07:04 +0000 (17:07 -0500)]
better fix for 25261

22 months agoRemove unreachable code (since 2020)
Eileen McNaughton [Mon, 2 Jan 2023 21:52:04 +0000 (10:52 +1300)]
Remove unreachable code (since 2020)

22 months agoMerge pull request #25253 from braders/api3-properties
Seamus Lee [Mon, 2 Jan 2023 21:01:51 +0000 (08:01 +1100)]
Merge pull request #25253 from braders/api3-properties

[REF][PHP8.2] Avoid dynamic properties in civicrm_api3 class

22 months agoMerge pull request #25252 from braders/empty-param-annotations
Seamus Lee [Mon, 2 Jan 2023 21:01:17 +0000 (08:01 +1100)]
Merge pull request #25252 from braders/empty-param-annotations

Remove empty param declarations in docblocks

22 months agoMove part of deprecated function loadRelatedObjects to calling functions
Eileen McNaughton [Mon, 2 Jan 2023 20:43:04 +0000 (09:43 +1300)]
Move part of deprecated function loadRelatedObjects to calling functions

22 months agoMerge pull request #25266 from braders/phpdoc-fixes3
Eileen McNaughton [Mon, 2 Jan 2023 20:07:54 +0000 (09:07 +1300)]
Merge pull request #25266 from braders/phpdoc-fixes3

PHPDoc corrections

22 months agoRemove empty param declarations in docblocks
Bradley Taylor [Sat, 31 Dec 2022 23:37:26 +0000 (23:37 +0000)]
Remove empty param declarations in docblocks

22 months agoMerge pull request #25265 from braders/tagelement-property-removal
demeritcowboy [Mon, 2 Jan 2023 17:48:03 +0000 (12:48 -0500)]
Merge pull request #25265 from braders/tagelement-property-removal

(REF) Remove _tagElement dynamic property

22 months agoMerge pull request #25261 from eileenmcnaughton/notice
demeritcowboy [Mon, 2 Jan 2023 17:31:30 +0000 (12:31 -0500)]
Merge pull request #25261 from eileenmcnaughton/notice

Smarty notice fix on contact search results

22 months agoPHPDoc corrections
Bradley Taylor [Mon, 2 Jan 2023 16:52:10 +0000 (16:52 +0000)]
PHPDoc corrections

22 months ago(REF) Remove _tagElement dynamic property
Bradley Taylor [Mon, 2 Jan 2023 16:18:47 +0000 (16:18 +0000)]
(REF) Remove _tagElement dynamic property

22 months agoMerge pull request #25238 from eileenmcnaughton/is_separate
Matthew Wire [Mon, 2 Jan 2023 09:49:55 +0000 (09:49 +0000)]
Merge pull request #25238 from eileenmcnaughton/is_separate

Extract `getMembershipBlock`

22 months agoMerge pull request #25263 from eileenmcnaughton/by_ref
Yashodha Chaku [Mon, 2 Jan 2023 07:52:10 +0000 (13:22 +0530)]
Merge pull request #25263 from eileenmcnaughton/by_ref

Remove unnecessary pass-by-ref

22 months agoMove legacy search selector file to legacy search extension
Eileen McNaughton [Mon, 2 Jan 2023 07:45:48 +0000 (20:45 +1300)]
Move legacy search selector file to legacy search extension

22 months agoRemove unnecessary pass-by-ref
Eileen McNaughton [Mon, 2 Jan 2023 06:02:44 +0000 (19:02 +1300)]
Remove unnecessary pass-by-ref

22 months agoSmarty notice fix on contact search results
Eileen McNaughton [Mon, 2 Jan 2023 04:34:14 +0000 (17:34 +1300)]
Smarty notice fix on contact search results

22 months agoRemove more deprecated functions
Eileen McNaughton [Mon, 2 Jan 2023 03:26:38 +0000 (16:26 +1300)]
Remove more deprecated functions

22 months agoRemove 2020 deprecated functions
Eileen McNaughton [Mon, 2 Jan 2023 03:23:36 +0000 (16:23 +1300)]
Remove 2020 deprecated functions

22 months agoMerge pull request #25257 from eileenmcnaughton/unused
demeritcowboy [Mon, 2 Jan 2023 01:57:50 +0000 (20:57 -0500)]
Merge pull request #25257 from eileenmcnaughton/unused

Remove unused variable

22 months agoImprove dataSet
Eileen McNaughton [Mon, 2 Jan 2023 01:48:52 +0000 (14:48 +1300)]
Improve dataSet

It seems when writing this test I thought it was worth having more confusing code
in order to have a clearer failure message - I think that might have been more valid
when writing the test than it is now it rarely fails

22 months agoNFC cleanup in test class
Eileen McNaughton [Mon, 2 Jan 2023 01:05:02 +0000 (14:05 +1300)]
NFC cleanup in test class

22 months agoMerge pull request #25255 from eileenmcnaughton/test_simp
Yashodha Chaku [Mon, 2 Jan 2023 01:45:09 +0000 (07:15 +0530)]
Merge pull request #25255 from eileenmcnaughton/test_simp

Simplify dataProvider in queryTest

22 months agoRemove unused variable
Eileen McNaughton [Mon, 2 Jan 2023 00:16:48 +0000 (13:16 +1300)]
Remove unused variable

22 months agoSimplify dataProvider in queryTest
Eileen McNaughton [Mon, 2 Jan 2023 00:02:51 +0000 (13:02 +1300)]
Simplify dataProvider in queryTest

This data provider really is not doing much more than returning
an array - but it's adding confusing complexity and a maintenance
need (as can be seen by the fact it has been edited for php 8 compatibility

22 months ago[REF][PHP8.2] Avoid dynamic properties in civicrm_api3 class
Bradley Taylor [Sun, 1 Jan 2023 15:09:54 +0000 (15:09 +0000)]
[REF][PHP8.2] Avoid dynamic properties in civicrm_api3 class

22 months agoUnconditionally assign registerClosed on event info page
Eileen McNaughton [Sun, 1 Jan 2023 04:57:47 +0000 (17:57 +1300)]
Unconditionally assign registerClosed on event info page

22 months agoMerge pull request #25246 from braders/payment-getbyclass-return-type
Eileen McNaughton [Sat, 31 Dec 2022 23:10:06 +0000 (12:10 +1300)]
Merge pull request #25246 from braders/payment-getbyclass-return-type

(NFC) Fix documented return type on getByClass method

22 months ago(NFC) Fix documented return type on getByClass method
Bradley Taylor [Sat, 31 Dec 2022 20:10:30 +0000 (20:10 +0000)]
(NFC) Fix documented return type on getByClass method

22 months ago[REF][PHP8.2] Avoid dynamic properties in CRM_Activity_BAO_ICalendar
Bradley Taylor [Sat, 31 Dec 2022 16:48:21 +0000 (16:48 +0000)]
[REF][PHP8.2] Avoid dynamic properties in CRM_Activity_BAO_ICalendar

22 months agoMerge pull request #25243 from braders/php82_mailbox_dynamic_properties
Eileen McNaughton [Fri, 30 Dec 2022 22:30:45 +0000 (11:30 +1300)]
Merge pull request #25243 from braders/php82_mailbox_dynamic_properties

[REF][PHP8.2] Avoid dynamic properties in mailstores

22 months agoMerge pull request #25244 from braders/php82_signer_dynamic_props
Eileen McNaughton [Fri, 30 Dec 2022 22:26:23 +0000 (11:26 +1300)]
Merge pull request #25244 from braders/php82_signer_dynamic_props

[REF][PHP8.2] Avoid dynamic properties in CRM_Utils_Signer

22 months agoMerge pull request #25221 from eileenmcnaughton/cust_ed3
demeritcowboy [Fri, 30 Dec 2022 20:02:30 +0000 (15:02 -0500)]
Merge pull request #25221 from eileenmcnaughton/cust_ed3

[REF] [merge custom fields function] Stop returning unaltered cFields parameter (good unit test cover)

22 months ago[REF][PHP8.2] Avoid dynamic properties in CRM_Utils_Signer
Bradley Taylor [Fri, 30 Dec 2022 19:56:44 +0000 (19:56 +0000)]
[REF][PHP8.2] Avoid dynamic properties in CRM_Utils_Signer

22 months agoMerge pull request #25242 from braders/var-docblock-type-order
demeritcowboy [Fri, 30 Dec 2022 16:07:43 +0000 (11:07 -0500)]
Merge pull request #25242 from braders/var-docblock-type-order

(NFC) When using @var annotations, ensure type comes first

22 months ago[REF][PHP8.2] Avoid dynamic properties in mailstores
Bradley Taylor [Fri, 30 Dec 2022 13:51:21 +0000 (13:51 +0000)]
[REF][PHP8.2] Avoid dynamic properties in mailstores

22 months agoWhen using @var annotations, ensure type comes first
Bradley Taylor [Fri, 30 Dec 2022 10:47:09 +0000 (10:47 +0000)]
When using @var annotations, ensure type comes first

22 months agoMerge pull request #25234 from braders/unused-line
Yashodha Chaku [Fri, 30 Dec 2022 04:13:47 +0000 (09:43 +0530)]
Merge pull request #25234 from braders/unused-line

[NFC] Remove line that does nothing

22 months agoMerge pull request #25240 from eileenmcnaughton/cancel
Yashodha Chaku [Fri, 30 Dec 2022 04:10:12 +0000 (09:40 +0530)]
Merge pull request #25240 from eileenmcnaughton/cancel

Remove legacy code payment processor handling

22 months agoMerge pull request #25236 from braders/shouldexitafterfatal-docblock
Eileen McNaughton [Fri, 30 Dec 2022 00:28:47 +0000 (13:28 +1300)]
Merge pull request #25236 from braders/shouldexitafterfatal-docblock

[NFC] Fix @method documentation for shouldExitAfterFatal

22 months agoRemove legacy code payment processor handling
Eileen McNaughton [Fri, 30 Dec 2022 00:03:27 +0000 (13:03 +1300)]
Remove legacy code payment processor handling

22 months agoExtract getMembershipBlock
Eileen McNaughton [Thu, 29 Dec 2022 23:31:08 +0000 (12:31 +1300)]
Extract getMembershipBlock

22 months agoMerge pull request #25231 from alifrumin/rn5.57
Eileen McNaughton [Thu, 29 Dec 2022 21:58:27 +0000 (10:58 +1300)]
Merge pull request #25231 from alifrumin/rn5.57

[NFC] first pass at 5.57 release notes

22 months agoFix @method documentation for shouldExitAfterFatal
Bradley Taylor [Thu, 29 Dec 2022 21:54:20 +0000 (21:54 +0000)]
Fix @method documentation for shouldExitAfterFatal

22 months agoMerge pull request #25230 from braders/php8-customdatabytype
Eileen McNaughton [Thu, 29 Dec 2022 21:44:29 +0000 (10:44 +1300)]
Merge pull request #25230 from braders/php8-customdatabytype

[REF] Fix strstr deprecation in CustomDataByType class

22 months agoMerge pull request #25233 from braders/remove-isHtml
Eileen McNaughton [Thu, 29 Dec 2022 21:42:41 +0000 (10:42 +1300)]
Merge pull request #25233 from braders/remove-isHtml

Remove broken method CRM_Utils_File::isHtml()

22 months agoRemove line that does nothing
Bradley Taylor [Thu, 29 Dec 2022 21:31:18 +0000 (21:31 +0000)]
Remove line that does nothing

22 months agoRemove broken method CRM_Utils_File::isHtml()
Bradley Taylor [Thu, 29 Dec 2022 20:10:22 +0000 (20:10 +0000)]
Remove broken method CRM_Utils_File::isHtml()

22 months agoFix strstr deprecation in CustomDataByType class
Bradley Taylor [Wed, 28 Dec 2022 20:35:28 +0000 (20:35 +0000)]
Fix strstr deprecation in CustomDataByType class

23 months ago[NFC] first pass 5.57 release notes
Alice Frumin [Wed, 28 Dec 2022 03:24:38 +0000 (22:24 -0500)]
[NFC] first pass 5.57 release notes

23 months agoMerge pull request #25227 from eileenmcnaughton/dedupe_rule
Yashodha Chaku [Wed, 28 Dec 2022 09:56:42 +0000 (15:26 +0530)]
Merge pull request #25227 from eileenmcnaughton/dedupe_rule

Support DedupeRules as Managed entities

23 months agoMerge pull request #25228 from civicrm/5.57
Eileen McNaughton [Wed, 28 Dec 2022 07:01:57 +0000 (20:01 +1300)]
Merge pull request #25228 from civicrm/5.57

5.57 to master

23 months agoMerge pull request #25225 from agh1/5.57.0-releasenotes-initial
Eileen McNaughton [Wed, 28 Dec 2022 07:01:22 +0000 (20:01 +1300)]
Merge pull request #25225 from agh1/5.57.0-releasenotes-initial

5.57.0 release notes initial run

23 months agoSupport DedupeRules as Managed entities
Eileen McNaughton [Wed, 28 Dec 2022 01:02:21 +0000 (14:02 +1300)]
Support DedupeRules as Managed entities

23 months ago5.57.0 release notes: added boilerplate
Andie Hunt [Tue, 27 Dec 2022 21:23:49 +0000 (16:23 -0500)]
5.57.0 release notes: added boilerplate

23 months ago5.57.0 release notes: raw from script
Andie Hunt [Tue, 27 Dec 2022 14:57:39 +0000 (09:57 -0500)]
5.57.0 release notes: raw from script

23 months agoMerge pull request #25223 from eileenmcnaughton/dep_opt
Yashodha Chaku [Tue, 27 Dec 2022 05:01:05 +0000 (10:31 +0530)]
Merge pull request #25223 from eileenmcnaughton/dep_opt

Remove deprecated ids from OptionValue::add

23 months agoRemove deprecated ids from OptionValue::add
Eileen McNaughton [Tue, 27 Dec 2022 02:49:32 +0000 (15:49 +1300)]
Remove deprecated ids from OptionValue::add

23 months agoStop returning unaltered cFields parameter
Eileen McNaughton [Mon, 26 Dec 2022 22:09:36 +0000 (11:09 +1300)]
Stop returning unaltered cFields parameter

23 months agoMerge pull request #25217 from braders/profile-image-accept-types
demeritcowboy [Fri, 23 Dec 2022 19:03:21 +0000 (14:03 -0500)]
Merge pull request #25217 from braders/profile-image-accept-types

Only allow valid image types to be uploaded to image_URL field on profiles

23 months agoMerge pull request #25216 from civicrm/5.57
demeritcowboy [Fri, 23 Dec 2022 18:09:31 +0000 (13:09 -0500)]
Merge pull request #25216 from civicrm/5.57

5.57

23 months agoOnly allow valid image types to be uploaded to image_URL field on profiles
Bradley Taylor [Fri, 23 Dec 2022 17:05:03 +0000 (17:05 +0000)]
Only allow valid image types to be uploaded to image_URL field on profiles

23 months agoMerge pull request #25213 from demeritcowboy/fract-qty
Yashodha Chaku [Fri, 23 Dec 2022 08:06:03 +0000 (13:36 +0530)]
Merge pull request #25213 from demeritcowboy/fract-qty

dev/core#4039 - Restore ability to have fractional quantity for text price fields