civicrm-core.git
14 months agoAPI/DAO - Improve permissioning sql clauses: support field names and OR
colemanw [Sun, 17 Sep 2023 22:11:03 +0000 (18:11 -0400)]
API/DAO - Improve permissioning sql clauses: support field names and OR

Before: selectWhereClause was limited to returning arrays of clauses which would be
joined with AND. They could not reference any other fields on the entity.

After: selectWhereClause can return sub-arrays which are joined with OR,
and can reference any field on the entity using {curly_brace} syntax.

Stricter type checking emits noisy deprecations if arrays are expected and strings are given.

14 months agoDAO - addSelectWhereClause should always return an array
colemanw [Sun, 17 Sep 2023 19:59:42 +0000 (15:59 -0400)]
DAO - addSelectWhereClause should always return an array

14 months agoActivity - More accurate calculation of permittedActivityTypes
colemanw [Sun, 17 Sep 2023 18:56:17 +0000 (14:56 -0400)]
Activity - More accurate calculation of permittedActivityTypes

The strict array key comparison seemed wrong, array_diff_key works better.
I was hoping this would be more efficient by skipping the where clause for
privledge users, but it doesn't. Oh well at least this is more correct.

14 months agoMake Note.privacy required
colemanw [Sun, 17 Sep 2023 15:31:52 +0000 (11:31 -0400)]
Make Note.privacy required

14 months agoMerge pull request #27531 from eileenmcnaughton/verify
Eileen McNaughton [Wed, 20 Sep 2023 09:03:42 +0000 (21:03 +1200)]
Merge pull request #27531 from eileenmcnaughton/verify

CiviMail - VERP should no longer require job_id for verification

14 months agoFix verify verp function to cope with job_id having been deleted
Eileen McNaughton [Wed, 20 Sep 2023 07:20:24 +0000 (19:20 +1200)]
Fix verify verp function to cope with job_id having been deleted

This allows the record to be validated based on queue_id & hash
(which is still pretty insane to brute force & allows
us to purge job records

14 months agoMerge pull request #27529 from civicrm/5.66
Eileen McNaughton [Wed, 20 Sep 2023 04:46:41 +0000 (16:46 +1200)]
Merge pull request #27529 from civicrm/5.66

5.66 to master

14 months agoMerge pull request #27528 from demeritcowboy/weight-again
Eileen McNaughton [Wed, 20 Sep 2023 04:46:00 +0000 (16:46 +1200)]
Merge pull request #27528 from demeritcowboy/weight-again

Fix weights again on contribution page settings dropdown

14 months agofix weights again
demeritcowboy [Wed, 20 Sep 2023 03:13:21 +0000 (23:13 -0400)]
fix weights again

14 months agoMerge pull request #27527 from colemanw/searchToolbar
Eileen McNaughton [Wed, 20 Sep 2023 03:26:36 +0000 (15:26 +1200)]
Merge pull request #27527 from colemanw/searchToolbar

SearchKit Toolbar - Fix conditionals, add tests

14 months agoSearchKit Toolbar - Fix conditionals, add tests
colemanw [Wed, 20 Sep 2023 02:38:35 +0000 (22:38 -0400)]
SearchKit Toolbar - Fix conditionals, add tests

14 months agoMerge pull request #27525 from larssandergreen/Remove-spaces-around-curly-braces...
Eileen McNaughton [Wed, 20 Sep 2023 01:39:45 +0000 (13:39 +1200)]
Merge pull request #27525 from larssandergreen/Remove-spaces-around-curly-braces-to-prepare-for-Smarty-3+

Remove spaces around curly braces to prepare for Smarty 3+

14 months agoRemove spaces around curly braces to prepare for Smarty 3+
larssandergreen [Wed, 20 Sep 2023 00:45:51 +0000 (18:45 -0600)]
Remove spaces around curly braces to prepare for Smarty 3+

14 months agoMerge pull request #27521 from civicrm/5.66
Seamus Lee [Tue, 19 Sep 2023 21:46:35 +0000 (07:46 +1000)]
Merge pull request #27521 from civicrm/5.66

5.66

14 months agoMerge pull request #27520 from colemanw/dfk
Eileen McNaughton [Tue, 19 Sep 2023 20:43:29 +0000 (08:43 +1200)]
Merge pull request #27520 from colemanw/dfk

APIv4 - Add dfk metadata to getfields

14 months agoMerge pull request #27476 from eileenmcnaughton/part_amounts
colemanw [Tue, 19 Sep 2023 20:34:59 +0000 (16:34 -0400)]
Merge pull request #27476 from eileenmcnaughton/part_amounts

Add test cover, use token for `event.is_share`

14 months agoAPIv4 - Hack around bad dfk metadata in unit tests
colemanw [Tue, 19 Sep 2023 18:56:16 +0000 (14:56 -0400)]
APIv4 - Hack around bad dfk metadata in unit tests

14 months agoAPIv4 - Add dfk metadata to getfields
colemanw [Tue, 19 Sep 2023 16:07:48 +0000 (12:07 -0400)]
APIv4 - Add dfk metadata to getfields

(mostly) fixes some bad guesswork in the APIv4 conformance test,
and now the dfk_entities metadata is available in getFields

14 months agoMerge pull request #27487 from eileenmcnaughton/pay_later
colemanw [Tue, 19 Sep 2023 16:22:36 +0000 (12:22 -0400)]
Merge pull request #27487 from eileenmcnaughton/pay_later

Fix notices in text versions of event receipts

14 months agoMerge pull request #27518 from demeritcowboy/bread
colemanw [Tue, 19 Sep 2023 15:37:28 +0000 (11:37 -0400)]
Merge pull request #27518 from demeritcowboy/bread

dev/core#4605 - Add yet another guard against failed upgrades

14 months agoMerge pull request #27517 from eileenmcnaughton/custom_param
colemanw [Tue, 19 Sep 2023 15:35:26 +0000 (11:35 -0400)]
Merge pull request #27517 from eileenmcnaughton/custom_param

Move nasty chunk of code to where it is used

14 months agoguard during upgrades
demeritcowboy [Tue, 19 Sep 2023 13:00:11 +0000 (09:00 -0400)]
guard during upgrades

14 months agoMerge pull request #27516 from eileenmcnaughton/participant82
demeritcowboy [Tue, 19 Sep 2023 12:47:52 +0000 (08:47 -0400)]
Merge pull request #27516 from eileenmcnaughton/participant82

Php8.x Fix notices when creating custom field

14 months agoMove nasty chunk of code to where it is used
Eileen McNaughton [Tue, 19 Sep 2023 10:36:17 +0000 (22:36 +1200)]
Move nasty chunk of code to where it is used

This code to get the customFields array is tough going. I haven't unravelled it, just moved it from being
figured out in one function & used in another such that it is figured out in the
chunk of code it is used in.

This will probably fix some php 8.2 tests because rather than all tests
hitting it only those that actually have custom fields + receipts do.

It's a bit of a fake win but it will reduce fails & make further cleanup easier

14 months agoPhp8.x Fix notices when creating custom field
Eileen McNaughton [Tue, 19 Sep 2023 10:23:45 +0000 (22:23 +1200)]
Php8.x Fix notices when creating custom field

14 months agoMerge pull request #27514 from eileenmcnaughton/regen
Eileen McNaughton [Tue, 19 Sep 2023 09:15:57 +0000 (21:15 +1200)]
Merge pull request #27514 from eileenmcnaughton/regen

Run regen

14 months agoRun regen
Eileen McNaughton [Tue, 19 Sep 2023 08:38:27 +0000 (20:38 +1200)]
Run regen

14 months agoMerge pull request #27510 from totten/master-event-dao
Eileen McNaughton [Tue, 19 Sep 2023 06:06:40 +0000 (18:06 +1200)]
Merge pull request #27510 from totten/master-event-dao

Regenerate CRM_Event_DAO_Event

14 months agoFix notices in text versions of event receipts
Eileen McNaughton [Mon, 18 Sep 2023 09:56:32 +0000 (21:56 +1200)]
Fix notices in text versions of event receipts

Pretty minor change but gets past the notices

14 months agoRegenerate CRM_Event_DAO_Event
Tim Otten [Tue, 19 Sep 2023 04:29:17 +0000 (21:29 -0700)]
Regenerate CRM_Event_DAO_Event

Recently changed by #27478

14 months agoMerge pull request #27478 from eileenmcnaughton/carty
colemanw [Tue, 19 Sep 2023 02:28:46 +0000 (22:28 -0400)]
Merge pull request #27478 from eileenmcnaughton/carty

Move Conference slots functionality to event cart

14 months agoMerge pull request #27482 from eileenmcnaughton/show_cms
colemanw [Tue, 19 Sep 2023 02:24:55 +0000 (22:24 -0400)]
Merge pull request #27482 from eileenmcnaughton/show_cms

Consolidate Profile Preview with other profile code

14 months agoMerge pull request #27488 from eileenmcnaughton/event_notice_custom_post
colemanw [Tue, 19 Sep 2023 02:22:32 +0000 (22:22 -0400)]
Merge pull request #27488 from eileenmcnaughton/event_notice_custom_post

php 8.x Ensure profiles are assigned to template, even when empty

14 months agoMerge pull request #27497 from eileenmcnaughton/sessions_offline
colemanw [Tue, 19 Sep 2023 01:57:35 +0000 (21:57 -0400)]
Merge pull request #27497 from eileenmcnaughton/sessions_offline

Remove event cart sessions handling from offline event receipt text as gone from html

14 months agoMerge pull request #27502 from eileenmcnaughton/legacy
Eileen McNaughton [Tue, 19 Sep 2023 01:53:35 +0000 (13:53 +1200)]
Merge pull request #27502 from eileenmcnaughton/legacy

Fix legacy custom searches to not use hacky method to access protected property on core class

14 months agoMerge pull request #27509 from eileenmcnaughton/renew
Eileen McNaughton [Tue, 19 Sep 2023 01:53:17 +0000 (13:53 +1200)]
Merge pull request #27509 from eileenmcnaughton/renew

php8.2 stop using yet-another undeclared property for _membershipId.

14 months agoMerge pull request #27503 from eileenmcnaughton/getvar
colemanw [Tue, 19 Sep 2023 01:49:50 +0000 (21:49 -0400)]
Merge pull request #27503 from eileenmcnaughton/getvar

Add deprecation annotations for getVar & setVar

14 months agoMerge pull request #27508 from civicrm/5.66
Eileen McNaughton [Tue, 19 Sep 2023 01:39:12 +0000 (13:39 +1200)]
Merge pull request #27508 from civicrm/5.66

5.66

14 months agoMerge pull request #27507 from eileenmcnaughton/survey
colemanw [Tue, 19 Sep 2023 01:31:53 +0000 (21:31 -0400)]
Merge pull request #27507 from eileenmcnaughton/survey

Remove getVar call, access protected property in same class directly

14 months agophp8.2 stop using yet-another undeclared property for _membershipId.
Eileen McNaughton [Tue, 19 Sep 2023 00:48:02 +0000 (12:48 +1200)]
php8.2 stop using yet-another undeclared property for _membershipId.

Instead follow our new practice of having consistent (externally supported)
functions for getting the main id variables

14 months agoMerge pull request #27475 from totten/5.66-comp-status
Tim Otten [Tue, 19 Sep 2023 00:30:28 +0000 (17:30 -0700)]
Merge pull request #27475 from totten/5.66-comp-status

Status Check - Ensure that components are enabled

14 months agoRemove getVar call, access protected property in same class directly
Eileen McNaughton [Tue, 19 Sep 2023 00:26:50 +0000 (12:26 +1200)]
Remove getVar call, access protected property in same class directly

14 months agoMerge pull request #27494 from agh1/5.66.0-releasenotes-initial
Eileen McNaughton [Tue, 19 Sep 2023 00:23:47 +0000 (12:23 +1200)]
Merge pull request #27494 from agh1/5.66.0-releasenotes-initial

5.66.0 release notes initial run

14 months agoMerge pull request #27499 from mlutfy/cleanupAndSend
Eileen McNaughton [Tue, 19 Sep 2023 00:23:24 +0000 (12:23 +1200)]
Merge pull request #27499 from mlutfy/cleanupAndSend

[NFC] Mail Logger: cleanup CIVICRM_MAIL_LOG_AND SEND

14 months agoFix legacy custom searches to not use hacky method to access protected property on...
Eileen McNaughton [Mon, 18 Sep 2023 23:58:30 +0000 (11:58 +1200)]
Fix legacy custom searches to not use hacky method to access protected property on core class

This avoids passing the form object to a function simply to extract the
links value & instead only calls the form object is it actually implements
the links function - which they basically don't...

This still works - ie I checked the actions are still available in custom searches
but respects the principle that protected variables are not public

14 months agoMerge pull request #27504 from civicrm/5.66
Eileen McNaughton [Tue, 19 Sep 2023 00:07:18 +0000 (12:07 +1200)]
Merge pull request #27504 from civicrm/5.66

5.66 to master

14 months agoMerge pull request #27501 from eileenmcnaughton/weight
Eileen McNaughton [Tue, 19 Sep 2023 00:06:37 +0000 (12:06 +1200)]
Merge pull request #27501 from eileenmcnaughton/weight

Add a couple more weights - legacy searches

14 months agoAdd deprecation annotations for getVar & setVar
Eileen McNaughton [Tue, 19 Sep 2023 00:04:01 +0000 (12:04 +1200)]
Add deprecation annotations for getVar & setVar

14 months agoAdd a couple more weights - legacy searches
Eileen McNaughton [Mon, 18 Sep 2023 23:30:12 +0000 (11:30 +1200)]
Add a couple more weights - legacy searches

14 months agoMerge pull request #27500 from civicrm/5.66
Eileen McNaughton [Mon, 18 Sep 2023 23:10:16 +0000 (11:10 +1200)]
Merge pull request #27500 from civicrm/5.66

5.66 to master

14 months agoMerge pull request #27492 from pradpnayak/entitybatch
Eileen McNaughton [Mon, 18 Sep 2023 23:09:45 +0000 (11:09 +1200)]
Merge pull request #27492 from pradpnayak/entitybatch

make grouptree protected so that it can be accessed via hook

14 months agoMail Logger: cleanup CIVICRM_MAIL_LOG_AND SEND
Mathieu Lu [Mon, 18 Sep 2023 22:58:39 +0000 (18:58 -0400)]
Mail Logger: cleanup CIVICRM_MAIL_LOG_AND SEND

14 months agoMerge pull request #27481 from totten/5.66-upg-comp-timing
colemanw [Mon, 18 Sep 2023 22:35:22 +0000 (18:35 -0400)]
Merge pull request #27481 from totten/5.66-upg-comp-timing

(dev/core#4521) Upgrader - Enable component-extensions before system-flush

14 months agoMerge pull request #27485 from eileenmcnaughton/payment_fields
Seamus Lee [Mon, 18 Sep 2023 22:23:59 +0000 (08:23 +1000)]
Merge pull request #27485 from eileenmcnaughton/payment_fields

[php 8.2] Declare _paymentFields with public visibility

14 months agomake grouptree protected so that it can be accessed via hook
Pradeep Nayak [Mon, 18 Sep 2023 15:05:48 +0000 (16:05 +0100)]
make grouptree protected so that it can be accessed via hook

14 months agoRemove event cart sessions handling from offline event receipt text as gone from...
Eileen McNaughton [Mon, 18 Sep 2023 21:54:09 +0000 (09:54 +1200)]
Remove event cart sessions handling from offline event receipt text as gone from html

14 months agoMerge pull request #27490 from eileenmcnaughton/activity_report
demeritcowboy [Mon, 18 Sep 2023 21:38:18 +0000 (17:38 -0400)]
Merge pull request #27490 from eileenmcnaughton/activity_report

php 8.2, ensure properties are declared on activity report

14 months agoMerge pull request #27480 from eileenmcnaughton/templates
colemanw [Mon, 18 Sep 2023 19:55:19 +0000 (15:55 -0400)]
Merge pull request #27480 from eileenmcnaughton/templates

Add some missing weights

14 months agoExclude inactive groups on recipient lists
John Kingsnorth [Mon, 18 Sep 2023 14:55:49 +0000 (15:55 +0100)]
Exclude inactive groups on recipient lists

14 months agoMerge pull request #27491 from JKingsnorth/patch-21
colemanw [Mon, 18 Sep 2023 19:19:16 +0000 (15:19 -0400)]
Merge pull request #27491 from JKingsnorth/patch-21

Exclude inactive groups on recipient lists for mailings

14 months agoMerge pull request #27489 from eileenmcnaughton/payment_block
colemanw [Mon, 18 Sep 2023 19:18:00 +0000 (15:18 -0400)]
Merge pull request #27489 from eileenmcnaughton/payment_block

Fix last notices on Online event registration by removing variables

14 months ago5.66.0 release notes: added boilerplate
Andie Hunt [Mon, 18 Sep 2023 19:12:20 +0000 (15:12 -0400)]
5.66.0 release notes: added boilerplate

14 months ago5.66.0 release notes: raw from script
Andie Hunt [Mon, 18 Sep 2023 19:08:53 +0000 (15:08 -0400)]
5.66.0 release notes: raw from script

14 months agoMerge pull request #27461 from colemanw/colType
colemanw [Mon, 18 Sep 2023 16:48:42 +0000 (12:48 -0400)]
Merge pull request #27461 from colemanw/colType

SearchKit - Add crm-search-col-type-* css classes

14 months agoMerge pull request #27477 from eileenmcnaughton/confirm
colemanw [Mon, 18 Sep 2023 15:39:11 +0000 (11:39 -0400)]
Merge pull request #27477 from eileenmcnaughton/confirm

Deprecate Form_Event::testSubmit, migrate test to full flow

14 months agoExclude inactive groups on recipient lists
John Kingsnorth [Mon, 18 Sep 2023 14:55:49 +0000 (15:55 +0100)]
Exclude inactive groups on recipient lists

14 months agophp 8.2, ensure properties are declared on activity report
Eileen McNaughton [Mon, 18 Sep 2023 10:47:07 +0000 (22:47 +1200)]
php 8.2, ensure properties are declared on activity report

14 months agoFix last notices on Online event registration by removing variables
Eileen McNaughton [Mon, 18 Sep 2023 10:32:01 +0000 (22:32 +1200)]
Fix last notices on Online event registration by removing variables

I hunted through to see why these variables are assigned
and they pre-date the switch to load the payment block from the

CRM_Financial_Form_Payment

There is no evidence of that form looking them up in
any way - so I think they can go....
https://github.com/civicrm/civicrm-core/commit/aaff4c697d6f94f01f5dacf5a3d876a95e50f5cb#diff-660258b71b4d1db49bdef38c7b3fcb4b698004ab39b57dcbd49083e256444272

14 months agoEnsure profiles are assigned to template, even when empty
Eileen McNaughton [Mon, 18 Sep 2023 10:23:42 +0000 (22:23 +1200)]
Ensure profiles are assigned to template, even when empty

14 months agoDeclare _paymentFields with public visibility
Eileen McNaughton [Mon, 18 Sep 2023 07:33:55 +0000 (19:33 +1200)]
Declare _paymentFields with public visibility

14 months agoConsolicate Profile Preview with other profile code
Eileen McNaughton [Mon, 18 Sep 2023 06:23:41 +0000 (18:23 +1200)]
Consolicate Profile Preview with other profile code

14 months agoAdd some missing weights
Eileen McNaughton [Mon, 18 Sep 2023 05:06:22 +0000 (17:06 +1200)]
Add some missing weights

14 months agoJenkins rejected the deprecated function in the style check
Eileen McNaughton [Mon, 18 Sep 2023 04:56:43 +0000 (16:56 +1200)]
Jenkins rejected the deprecated function in the style check

14 months agoDeprecate Form_Event::testSubmit, migrate test to full clow
Eileen McNaughton [Mon, 18 Sep 2023 02:03:26 +0000 (14:03 +1200)]
Deprecate Form_Event::testSubmit, migrate test to full clow

In the procss I looked at what the test is actually testing & the goal of the test is ensure the
doPayment contract is met, specifically regarding contactID
https://docs.civicrm.org/dev/en/latest/extensions/payment-processors/create/#getpaymentformfields

I updated the test to use the alterPaymentProcessorParams hook to actually check for that.

14 months agoUpgrader - 5.63 upgrade should use simple extension installation
Tim Otten [Mon, 18 Sep 2023 04:13:41 +0000 (21:13 -0700)]
Upgrader - 5.63 upgrade should use simple extension installation

14 months agoUpgrader - Multiple fixes for new enableSimpleExtension()
Tim Otten [Mon, 18 Sep 2023 04:13:20 +0000 (21:13 -0700)]
Upgrader - Multiple fixes for new enableSimpleExtension()

14 months agoUpgrader - Implement addSimpleExtensionTask(). Update docblocks.
Tim Otten [Mon, 18 Sep 2023 01:41:31 +0000 (18:41 -0700)]
Upgrader - Implement addSimpleExtensionTask(). Update docblocks.

14 months agoMove Conference slots functionality to event cart
Eileen McNaughton [Mon, 18 Sep 2023 04:03:57 +0000 (16:03 +1200)]
Move Conference slots functionality to event cart

14 months agoMerge pull request #27469 from eileenmcnaughton/no_event_cart
Eileen McNaughton [Mon, 18 Sep 2023 03:29:50 +0000 (15:29 +1200)]
Merge pull request #27469 from eileenmcnaughton/no_event_cart

Stop enabling event_cart on new installs

14 months agoMerge pull request #27456 from eileenmcnaughton/user_email
demeritcowboy [Mon, 18 Sep 2023 01:25:00 +0000 (21:25 -0400)]
Merge pull request #27456 from eileenmcnaughton/user_email

PHP8.2 Remove undefined property userName

14 months agoAdd enableSimpleExtension upgrade function
colemanw [Fri, 8 Sep 2023 12:59:14 +0000 (08:59 -0400)]
Add enableSimpleExtension upgrade function

14 months agoStop enabling event_cart on new installs
Eileen McNaughton [Sun, 17 Sep 2023 22:25:34 +0000 (10:25 +1200)]
Stop enabling event_cart on new installs

Although we have not fully extracted this, it seems that disabling does not
cause any errors, so it makes sense to stop enabling. Once we have been running
like this on our dev & demo sites for a while we can disable it
for any existing sites that do not have
event cart enabled

14 months agoAdd test cover, use token for event.is_share
Eileen McNaughton [Mon, 18 Sep 2023 00:11:06 +0000 (12:11 +1200)]
Add test cover, use token for event.is_share

Also fix a couple of places where is_monetary is using the smarty variable.

We have updated & tested is_monetary elsewhere

14 months agoMerge pull request #27473 from eileenmcnaughton/style
Eileen McNaughton [Mon, 18 Sep 2023 00:13:17 +0000 (12:13 +1200)]
Merge pull request #27473 from eileenmcnaughton/style

Rename locally assigned variable for clarity

14 months agoStatus Check - Ensure that components are enabled
Tim Otten [Sun, 17 Sep 2023 23:42:03 +0000 (16:42 -0700)]
Status Check - Ensure that components are enabled

14 months agoRename locally assigned variable for clarity
Eileen McNaughton [Sun, 17 Sep 2023 23:30:24 +0000 (11:30 +1200)]
Rename locally assigned variable for clarity

14 months agoRemove undefined property userName
Eileen McNaughton [Fri, 15 Sep 2023 23:35:35 +0000 (11:35 +1200)]
Remove undefined property userName

This is causing issues on a bunch of classes - but in fact
is only used on the ContributionForm

14 months agoMerge pull request #27468 from eileenmcnaughton/contribution_json
Eileen McNaughton [Sun, 17 Sep 2023 22:54:46 +0000 (10:54 +1200)]
Merge pull request #27468 from eileenmcnaughton/contribution_json

Hardened smarty - fix mishandling of json

14 months agoMerge pull request #27467 from eileenmcnaughton/contribution_trivia
colemanw [Sun, 17 Sep 2023 22:50:19 +0000 (18:50 -0400)]
Merge pull request #27467 from eileenmcnaughton/contribution_trivia

Superficial tidy up in backoffice contribution form

14 months agoMerge pull request #27466 from eileenmcnaughton/part_
Eileen McNaughton [Sun, 17 Sep 2023 22:23:33 +0000 (10:23 +1200)]
Merge pull request #27466 from eileenmcnaughton/part_

Fix test template to use the same tokens as the templates

14 months agoHardened smarty - fix mishandling of json
Eileen McNaughton [Sun, 17 Sep 2023 22:21:54 +0000 (10:21 +1200)]
Hardened smarty - fix mishandling of json

14 months agoSuperficial tidy up in backoffice contribution form
Eileen McNaughton [Sun, 17 Sep 2023 22:13:33 +0000 (10:13 +1200)]
Superficial tidy up in backoffice contribution form

14 months agoFix template to use the same tokens as the templates
Eileen McNaughton [Sun, 17 Sep 2023 21:29:14 +0000 (09:29 +1200)]
Fix template to use the same tokens as the templates

14 months agoMerge pull request #27465 from civicrm/5.66
demeritcowboy [Sun, 17 Sep 2023 19:03:12 +0000 (15:03 -0400)]
Merge pull request #27465 from civicrm/5.66

5.66

14 months agoMerge pull request #27464 from demeritcowboy/oh-snap
demeritcowboy [Sun, 17 Sep 2023 18:12:55 +0000 (14:12 -0400)]
Merge pull request #27464 from demeritcowboy/oh-snap

Upgrade - don't crash on earlier versions of mariadb

14 months agodon't crash on earlier versions
demeritcowboy [Sun, 17 Sep 2023 17:27:00 +0000 (13:27 -0400)]
don't crash on earlier versions

14 months agoMerge pull request #27462 from demeritcowboy/dao
demeritcowboy [Sun, 17 Sep 2023 17:00:48 +0000 (13:00 -0400)]
Merge pull request #27462 from demeritcowboy/dao

DAO out of date

14 months agoMerge pull request #27463 from demeritcowboy/regexp
demeritcowboy [Sun, 17 Sep 2023 17:00:37 +0000 (13:00 -0400)]
Merge pull request #27463 from demeritcowboy/regexp

[NFC] phpunit 9 compatibility

14 months agoregexp
demeritcowboy [Sun, 17 Sep 2023 14:23:12 +0000 (10:23 -0400)]
regexp

14 months agodao out of date
demeritcowboy [Sun, 17 Sep 2023 14:11:36 +0000 (10:11 -0400)]
dao out of date