Eileen McNaughton [Thu, 16 Feb 2023 03:50:40 +0000 (16:50 +1300)]
Fix more schema checks to use mysql DATABASE() function, deprecate php function
Eileen McNaughton [Thu, 16 Feb 2023 01:34:29 +0000 (14:34 +1300)]
Merge pull request #25591 from seamuslee001/master
[REF] Fix undefined variable notice in WordPress tests
Seamus Lee [Wed, 15 Feb 2023 23:15:34 +0000 (10:15 +1100)]
[REF] Fix undefined variable notice in WordPress tests
Remove reference to as not need
Seamus Lee [Thu, 16 Feb 2023 00:09:14 +0000 (11:09 +1100)]
Merge pull request #25590 from civicrm/5.59
5.59
CiviCRM [Wed, 15 Feb 2023 22:48:33 +0000 (22:48 +0000)]
Merge branch '5.59' of github.com:civicrm/civicrm-core into 5.59
demeritcowboy [Wed, 15 Feb 2023 15:53:57 +0000 (10:53 -0500)]
Merge pull request #25584 from civicrm/5.59
5.59
demeritcowboy [Wed, 15 Feb 2023 14:25:37 +0000 (09:25 -0500)]
Merge pull request #25583 from totten/5.59-tz-severity
Status Check - Tweak severity of timezone warning
Tim Otten [Wed, 15 Feb 2023 10:29:09 +0000 (02:29 -0800)]
Status Check - Tweak severity of timezone warning
Seamus Lee [Wed, 15 Feb 2023 07:12:42 +0000 (18:12 +1100)]
Merge pull request #25582 from civicrm/5.59
5.59
Seamus Lee [Wed, 15 Feb 2023 06:25:05 +0000 (17:25 +1100)]
Merge pull request #25578 from seamuslee001/dev_core_4119
dev/core#4119 Only generate error on blank confirm_title if confirmat…
Seamus Lee [Wed, 15 Feb 2023 06:23:13 +0000 (17:23 +1100)]
Merge pull request #25581 from seamuslee001/master
5.59
Seamus Lee [Wed, 15 Feb 2023 06:21:52 +0000 (17:21 +1100)]
Merge branch '5.59'
Seamus Lee [Thu, 2 Feb 2023 02:14:04 +0000 (13:14 +1100)]
security/core#121 Add in hard coded list of file extensions that should be prohibited form being treated as safe no matter what
Expand the list of extensions as per Tim and allow for users to define their own list via a constant
Seamus Lee [Wed, 15 Feb 2023 05:43:58 +0000 (16:43 +1100)]
dev/core#4119 Only generate error on blank confirm_title if confirmation page is enabled or the event is monetary
Eileen McNaughton [Wed, 15 Feb 2023 05:25:46 +0000 (18:25 +1300)]
Merge pull request #25576 from totten/master-suppressed
CiviContribute - Fix warning about 'suppressedEmails' when generating PDF
Tim Otten [Wed, 15 Feb 2023 04:30:57 +0000 (20:30 -0800)]
Merge pull request #25547 from eileenmcnaughton/559
dev/core#4080 Fix wrong pdf format selection for invoice, when configured
Tim Otten [Wed, 15 Feb 2023 03:12:14 +0000 (19:12 -0800)]
CiviContribute - Fix warning about 'suppressedEmails' when generating PDF
Use-case:
* Open and execute "Find Contributions"
* Next to a contribution, choose "more > Send receipt"
* Make a PDF
* Open another tab and view any other page.
* There is warning:
Notice: Undefined index: suppressedEmails in CRM_Contribute_Form_Task_PDF->postProcess()
(line 139 of ..../web/sites/all/modules/civicrm/CRM/Contribute/Form/Task/PDF.php)."
Before:
* `$pdfElements['suppressedEmails']` is not always returned
* $pdfElements['excludeContactIds'] is alsways returned
After:
* Both are always returned, even if empty
Tim Otten [Wed, 15 Feb 2023 02:00:20 +0000 (18:00 -0800)]
Merge pull request #25548 from eileenmcnaughton/559_token
(dev/core#4109) Fix tokens like `{contact.email_primary.email}`
Mathieu Lu [Tue, 14 Feb 2023 14:37:43 +0000 (09:37 -0500)]
Merge pull request #25383 from totten/master-ts-smarty
Smarty {ts} - For extensions, use fallback similar to E::ts() and JS ts()
Yashodha Chaku [Tue, 14 Feb 2023 07:43:18 +0000 (13:13 +0530)]
Merge pull request #25565 from eileenmcnaughton/act_links
Make `activity_type_id` available to `links` hook, test
Yashodha Chaku [Tue, 14 Feb 2023 05:06:38 +0000 (10:36 +0530)]
Merge pull request #25517 from eileenmcnaughton/gettree
Make unshared `getTree` function private, remove never passed params
Eileen McNaughton [Tue, 14 Feb 2023 03:33:00 +0000 (16:33 +1300)]
Merge pull request #25567 from civicrm/5.59
5.59 to master
Eileen McNaughton [Tue, 14 Feb 2023 02:35:19 +0000 (15:35 +1300)]
Make activity_type_id available to links, test
demeritcowboy [Tue, 14 Feb 2023 03:19:57 +0000 (22:19 -0500)]
Merge pull request #25564 from eileenmcnaughton/activity_links
Preliminary cleanup, comments, type hints
Eileen McNaughton [Tue, 14 Feb 2023 03:16:53 +0000 (16:16 +1300)]
Merge pull request #25555 from seamuslee001/dev_core_4116
dev/core#4116 Add in rebuilding log table schema when modifying schema
Eileen McNaughton [Tue, 14 Feb 2023 02:00:48 +0000 (15:00 +1300)]
Preliminary cleanup, comments, type hints
demeritcowboy [Mon, 13 Feb 2023 21:33:16 +0000 (16:33 -0500)]
Merge pull request #25329 from herbdool/core-4076
dev/core#4076 split up the theme method
Eileen McNaughton [Mon, 13 Feb 2023 20:25:46 +0000 (09:25 +1300)]
Merge pull request #25554 from demeritcowboy/upgrade-crash
Fix fatal error on upgrade success screen
Herb v/d Dool [Wed, 11 Jan 2023 21:55:20 +0000 (16:55 -0500)]
dev/core#4076 split up the theme method
Yashodha Chaku [Mon, 13 Feb 2023 12:17:42 +0000 (17:47 +0530)]
Merge pull request #25560 from mlutfy/mailingSummaryPseudo
Mailing Summary Report: support pseudofields
Seamus Lee [Sun, 12 Feb 2023 23:43:46 +0000 (10:43 +1100)]
Merge pull request #25562 from braders/properties-emailtest
[REF][PHP8.2] Remove use of dynamic properties in CRM_Contact_Form_Task_EmailTest
Bradley Taylor [Sun, 12 Feb 2023 13:32:53 +0000 (13:32 +0000)]
[REF][PHP8.2] Remove use of dynamic properties in CRM_Contact_Form_Task_EmailTest
demeritcowboy [Sat, 11 Feb 2023 23:10:21 +0000 (18:10 -0500)]
Merge pull request #25561 from braders/dynamic-properties-authorize-net-test
[REF][PHP8.2] Get rid of dynamic properties in CRM_Core_Payment_AuthorizeNetTest
Bradley Taylor [Sat, 11 Feb 2023 19:14:18 +0000 (19:14 +0000)]
[REF][PHP8.2] Get rid of dynamic properties in CRM_Core_Payment_AuthorizeNetTest
Mathieu Lutfy [Sat, 11 Feb 2023 17:52:09 +0000 (12:52 -0500)]
Mailing Summary Report: support pseudofields
demeritcowboy [Sat, 11 Feb 2023 17:06:12 +0000 (12:06 -0500)]
Merge pull request #25559 from braders/dynamic-property-additionalpaymenttest
[REF][PHP8.2] Stop use of dynamic property in AdditionalPaymentTest
demeritcowboy [Sat, 11 Feb 2023 17:05:40 +0000 (12:05 -0500)]
Merge pull request #25558 from braders/dynmaic-property-ajaxtest
[REF][PHP8.2] Use variable instead of dynmaic property (CRM_Group_Page_AjaxTest)
demeritcowboy [Sat, 11 Feb 2023 17:05:28 +0000 (12:05 -0500)]
Merge pull request #25557 from braders/pledge-block-test-property
[REF][PHP8.2] Declare property in CRM_Pledge_BAO_PledgeBlockTest
demeritcowboy [Sat, 11 Feb 2023 17:05:18 +0000 (12:05 -0500)]
Merge pull request #25556 from braders/fake-object-php8.2
[REF][PHP8.2] Declare property in CRM_Utils_FakeObject
Bradley Taylor [Sat, 11 Feb 2023 15:43:09 +0000 (15:43 +0000)]
[REF][PHP8.2] Stop use of dynamic property in AdditionalPaymentTest
Bradley Taylor [Sat, 11 Feb 2023 15:36:00 +0000 (15:36 +0000)]
[REF][PHP8.2] Use variable instead of dynmaic property (CRM_Group_Page_AjaxTest)
Bradley Taylor [Sat, 11 Feb 2023 15:26:04 +0000 (15:26 +0000)]
[REF][PHP8.2] Declare property in CRM_Pledge_BAO_PledgeBlockTest
demeritcowboy [Sat, 11 Feb 2023 13:53:42 +0000 (08:53 -0500)]
Merge pull request #25514 from eileenmcnaughton/smarty-search
A couple of minor smarty notice fixes
Bradley Taylor [Sat, 11 Feb 2023 13:36:22 +0000 (13:36 +0000)]
[REF][PHP8.2] Declare property in CRM_Utils_FakeObject
Seamus Lee [Sat, 11 Feb 2023 05:14:19 +0000 (16:14 +1100)]
dev/core#4116 Add in rebuilding log table schema when modifying schema
Only rebuild if logging is enabled
demeritcowboy [Sat, 11 Feb 2023 04:52:07 +0000 (23:52 -0500)]
Merge pull request #25551 from eileenmcnaughton/tokens
Upgrade test to use more recent methodology for testing forms
demeritcowboy [Sat, 11 Feb 2023 04:45:10 +0000 (23:45 -0500)]
fix fatal error
Tim Otten [Sat, 11 Feb 2023 01:19:36 +0000 (17:19 -0800)]
Merge pull request #25544 from eileenmcnaughton/smarty_tpl
Smarty notice fix
Eileen McNaughton [Fri, 10 Feb 2023 21:57:48 +0000 (10:57 +1300)]
Upgrade test to use more recent methodology for testing forms
The tested class had been hacked to accept parameters to postProcess,
but we can now avoid that & it will likely be rejected in a later php
version / muddy the waters
Eileen McNaughton [Fri, 10 Feb 2023 03:36:58 +0000 (16:36 +1300)]
dev/core#4109 Fix advertised tokens to work
Eileen McNaughton [Mon, 6 Feb 2023 21:33:13 +0000 (10:33 +1300)]
A couple of minor smarty notice fixes
Eileen McNaughton [Fri, 10 Feb 2023 01:44:32 +0000 (14:44 +1300)]
dev/core#4080 Fix wrong pdf format selection for invoice, when configured
To replicate this I
1) created a new pdf format at civicrm/admin/pdfFormats?reset=1 with a top margin
of about 6 metres
2) edited the invoice MessageTemplate to use this pdf format
3) enabled invoicing
4) generated a pdf from the user dashboard
5) lots of white space.....
6) reset the invoice MessageTemplate not to have a selected pdf
7) it looked ... normal
Yashodha Chaku [Fri, 10 Feb 2023 03:07:52 +0000 (08:37 +0530)]
Merge pull request #25519 from eileenmcnaughton/gettree2
Remove always-NULL `$singleRecord` variable
Eileen McNaughton [Fri, 10 Feb 2023 02:51:07 +0000 (15:51 +1300)]
Merge pull request #25546 from eileenmcnaughton/smarty_pledge
Enotice fix, pledge block on UserDashboard
Eileen McNaughton [Fri, 10 Feb 2023 00:17:51 +0000 (13:17 +1300)]
Enotice fix, pledge block on UserDashboard
Eileen McNaughton [Thu, 9 Feb 2023 23:59:12 +0000 (12:59 +1300)]
Merge pull request #25521 from colemanw/actionsMenu
SearchKit - Configurable action menu tasks per-search-display
Eileen McNaughton [Thu, 9 Feb 2023 23:24:32 +0000 (12:24 +1300)]
Smarty notice fix
Yashodha Chaku [Thu, 9 Feb 2023 11:16:53 +0000 (16:46 +0530)]
Merge pull request #25541 from eileenmcnaughton/null_obj
Do not use reference for Object parameter, death to `_NULLObject`
Eileen McNaughton [Thu, 9 Feb 2023 07:22:13 +0000 (20:22 +1300)]
Fix notice, do not pass values that match defaults
Eileen McNaughton [Thu, 9 Feb 2023 05:53:48 +0000 (18:53 +1300)]
Merge pull request #25540 from eileenmcnaughton/world
Remove invalid 'world_region' => 'India' from test
Eileen McNaughton [Thu, 9 Feb 2023 05:02:14 +0000 (18:02 +1300)]
Do not use reference for Object parameter, deathto _NULlObject
Eileen McNaughton [Thu, 9 Feb 2023 04:51:37 +0000 (17:51 +1300)]
Remove invalid 'world_region' => 'India' from test
Coleman Watts [Tue, 7 Feb 2023 23:24:57 +0000 (18:24 -0500)]
SearchKit - Configurable action menu tasks per-search-display
Seamus Lee [Thu, 9 Feb 2023 01:49:10 +0000 (12:49 +1100)]
Merge pull request #25537 from eileenmcnaughton/database
Fix a couple more places to use mysql DATABASE() function
Seamus Lee [Thu, 9 Feb 2023 01:48:48 +0000 (12:48 +1100)]
Merge pull request #25538 from civicrm/5.59
5.59
colemanw [Thu, 9 Feb 2023 01:19:21 +0000 (20:19 -0500)]
Merge pull request #25539 from demeritcowboy/query
Typo executequery => executeQuery
demeritcowboy [Thu, 9 Feb 2023 00:44:16 +0000 (19:44 -0500)]
typo
demeritcowboy [Thu, 9 Feb 2023 00:41:35 +0000 (19:41 -0500)]
Merge pull request #25534 from totten/5.59-test-tz
CiviTestListener - Headless tests should initialize timezone
demeritcowboy [Thu, 9 Feb 2023 00:37:59 +0000 (19:37 -0500)]
Merge pull request #25524 from eileenmcnaughton/finder_test
NFC cleanup in test class
Eileen McNaughton [Wed, 8 Feb 2023 22:59:12 +0000 (11:59 +1300)]
Fix a couple more places to use mysql DATABASE() function
Tim Otten [Wed, 8 Feb 2023 22:47:51 +0000 (14:47 -0800)]
CiviTestListener - Headless tests should have initialized timezone
Before
------
* `CiviUnitTestCase` calls `setMySQLTimeZone()`
* Headless tests (which are initialized via `CiviTestListener`) do not call `setMySQLTimeZone()`
* If you have a test like 5.57's flavor of `QueueTest`, then the tests pass or fail depending on happenstance of server timezone configuration.
After
-----
* `CiviUnitTestCase` and `CiviTestListener` both call `setMySQLTimeZone()`
* If you have a test like 5.57's flavor of `QueueTest`, then the tests pass more consistently.
Comments
--------
This branch should work cleanly as PR for `5.59` (rc) or `master`. I'd
rather like to use this in `5.57-esr` (so that tests run more cleanly).
So maybe `5.59` is the better target (but it doesn't strictly have to be).
Seamus Lee [Wed, 8 Feb 2023 22:47:03 +0000 (09:47 +1100)]
Merge pull request #25530 from eileenmcnaughton/database
Use mysql DATABASE() function instead of php code
Eileen McNaughton [Wed, 8 Feb 2023 02:16:36 +0000 (15:16 +1300)]
NFC cleanup in test class
Eileen McNaughton [Wed, 8 Feb 2023 22:12:05 +0000 (11:12 +1300)]
Merge pull request #25531 from civicrm/5.59
5.59
Eileen McNaughton [Wed, 8 Feb 2023 20:01:10 +0000 (09:01 +1300)]
Use mysql DATABASE() function instead of php code
Yashodha Chaku [Wed, 8 Feb 2023 13:48:13 +0000 (19:18 +0530)]
Merge pull request #25528 from eileenmcnaughton/database
Use `DATABASE()` function rather than lossa code
Yashodha Chaku [Wed, 8 Feb 2023 11:13:40 +0000 (16:43 +0530)]
Merge pull request #25525 from seamuslee001/group_filter_acl
dev/core#4068 Prevent adding in addSelectWhereClause for civicrm_group when filtering by a group as unneded for reports
Seamus Lee [Wed, 8 Feb 2023 03:26:56 +0000 (14:26 +1100)]
dev/core#4068 Expand test coverage to include the contact summary report which is a non optimised report template
Seamus Lee [Wed, 8 Feb 2023 02:40:19 +0000 (13:40 +1100)]
dev/core#4068 Prevent adding in addSelectWhereClause for civicrm_group when filtering by a group as unneded for reports
Add in failing test to demonstrate issue with Group add SelectWhereClause on reports
Yashodha Chaku [Wed, 8 Feb 2023 05:48:18 +0000 (11:18 +0530)]
Merge pull request #24861 from eileenmcnaughton/dash
Enotice fix on userDashboard with contributions, replace deprecated functions with api4v calls
Eileen McNaughton [Wed, 8 Feb 2023 05:00:38 +0000 (18:00 +1300)]
Use DATABASE function rather than lossa code
Seamus Lee [Wed, 8 Feb 2023 04:45:25 +0000 (15:45 +1100)]
Merge pull request #25526 from civicrm/5.59
5.59
demeritcowboy [Wed, 8 Feb 2023 03:33:48 +0000 (22:33 -0500)]
Merge pull request #25523 from demeritcowboy/dompdf-559
Backport 25520
dependabot[bot] [Tue, 7 Feb 2023 23:51:27 +0000 (23:51 +0000)]
Bump dompdf/dompdf from 2.0.2 to 2.0.3
Dependabot couldn't find the original pull request head commit,
889dfb1c9efc4cba2f79ab4088c30fe6774c0835.
Eileen McNaughton [Wed, 8 Feb 2023 01:38:04 +0000 (14:38 +1300)]
Merge pull request #25520 from civicrm/dependabot/composer/dompdf/dompdf-2.0.3
Bump dompdf/dompdf from 2.0.2 to 2.0.3
demeritcowboy [Wed, 8 Feb 2023 00:09:57 +0000 (19:09 -0500)]
Merge pull request #25510 from eileenmcnaughton/dep_token5
Add noisy deprecation to `replaceHookTokens`
dependabot[bot] [Tue, 7 Feb 2023 23:51:27 +0000 (23:51 +0000)]
Bump dompdf/dompdf from 2.0.2 to 2.0.3
Dependabot couldn't find the original pull request head commit,
889dfb1c9efc4cba2f79ab4088c30fe6774c0835.
colemanw [Tue, 7 Feb 2023 23:16:08 +0000 (18:16 -0500)]
Merge pull request #25516 from eileenmcnaughton/expires
dev/core#4117 Add is_current to UserJob, Search
Eileen McNaughton [Sun, 30 Oct 2022 23:00:39 +0000 (12:00 +1300)]
Cleanup notices on contribution.userDashboard, switch to apiv4
Escape option-possible values
Adjust test for change in order
Herb v/d Dool [Wed, 11 Jan 2023 21:55:20 +0000 (16:55 -0500)]
dev/core#4076 split up the theme method
Yashodha Chaku [Tue, 7 Feb 2023 05:36:20 +0000 (11:06 +0530)]
Merge pull request #25518 from eileenmcnaughton/gettree1
Remove never-true IF
Eileen McNaughton [Tue, 7 Feb 2023 01:46:54 +0000 (14:46 +1300)]
Remove always-NULL singleRecord
Eileen McNaughton [Tue, 7 Feb 2023 01:42:35 +0000 (14:42 +1300)]
Remove never-true IF
Per https://github.com/civicrm/civicrm-core/pull/25517 is
always FALSE so this IF is never true
Eileen McNaughton [Tue, 7 Feb 2023 01:36:05 +0000 (14:36 +1300)]
Make unshared getTree function private, remove never passed params
This function is a recent split from a complex function. It is called
from 2 places, within this file so this
1) makes it private
2) removes never-passed parameters
https://github.com/civicrm/civicrm-core/commit/
1090db413680855d449671b841af8185f0baeb1f#diff-fe60c89ebe94bbd40114d135459371cc53708db1f2952ade6c0ce9b3468c4dabR1720
colemanw [Tue, 7 Feb 2023 01:12:14 +0000 (20:12 -0500)]
Merge pull request #25395 from eileenmcnaughton/cust_process
Remove interaction with complex legacy `getTree` function
Eileen McNaughton [Tue, 7 Feb 2023 00:20:24 +0000 (13:20 +1300)]
Merge pull request #25515 from jmcclelland/limit-dedupe-rules-on-import
only load dedupe rules for the chosen entity
Eileen McNaughton [Tue, 7 Feb 2023 00:08:32 +0000 (13:08 +1300)]
dev/core#4117 Add is_current to UserJob, Search
colemanw [Tue, 7 Feb 2023 00:08:48 +0000 (19:08 -0500)]
Merge pull request #25195 from eileenmcnaughton/build_divide_event
Post divide code tidy up
Jamie McClelland [Mon, 6 Feb 2023 22:02:25 +0000 (17:02 -0500)]
only load dedupe rules for the chosen entity
I'm not sure how long this has been broken??
CRM_Dedupe_BAO_DedupeRuleGroup::getByType() clearly takes a string
and will never get one without this change.
Eileen McNaughton [Fri, 20 Jan 2023 01:16:14 +0000 (14:16 +1300)]
Remove interaction with complex legacy getTree function