civicrm-core.git
13 months agoMerge pull request #27666 from mattwire/api4underscore
colemanw [Sat, 14 Oct 2023 15:16:39 +0000 (11:16 -0400)]
Merge pull request #27666 from mattwire/api4underscore

Searchdisplay issue with contact join activity and _ on the end of custom field

13 months agoMerge pull request #27782 from eileenmcnaughton/configure_amount
colemanw [Sat, 14 Oct 2023 15:10:36 +0000 (11:10 -0400)]
Merge pull request #27782 from eileenmcnaughton/configure_amount

Smarty3 compatibilty with Contribution Amount tab

13 months agoMerge pull request #27787 from eileenmcnaughton/no_soft
colemanw [Sat, 14 Oct 2023 15:09:21 +0000 (11:09 -0400)]
Merge pull request #27787 from eileenmcnaughton/no_soft

Remove irrelevant code from previously shared form

13 months agoMerge pull request #27826 from colemanw/arrayCleanupMailing
Eileen McNaughton [Sat, 14 Oct 2023 05:07:46 +0000 (18:07 +1300)]
Merge pull request #27826 from colemanw/arrayCleanupMailing

[REF] CRM/Mailing - Refactor unnecessary uses of CRM_Utils_Array::value

13 months agoMerge pull request #27827 from colemanw/arrayCleanupMisc
Eileen McNaughton [Sat, 14 Oct 2023 05:07:29 +0000 (18:07 +1300)]
Merge pull request #27827 from colemanw/arrayCleanupMisc

[REF] CRM/Misc - Refactor unnecessary uses of CRM_Utils_Array::value

13 months agoMerge pull request #27828 from colemanw/arrayCleanupFlex
Eileen McNaughton [Sat, 14 Oct 2023 05:07:11 +0000 (18:07 +1300)]
Merge pull request #27828 from colemanw/arrayCleanupFlex

[REF] Flexmailer - Refactor unnecessary use of CRM_Utils_Array::value

13 months agoFlexmailer - Refactor unnecessary uses of CRM_Utils_Array::value
colemanw [Fri, 13 Oct 2023 23:45:42 +0000 (19:45 -0400)]
Flexmailer - Refactor unnecessary uses of CRM_Utils_Array::value

13 months agoCRM/Misc - Refactor unnecessary uses of CRM_Utils_Array::value
colemanw [Fri, 13 Oct 2023 23:45:24 +0000 (19:45 -0400)]
CRM/Misc - Refactor unnecessary uses of CRM_Utils_Array::value

13 months agoCRM/Mailing - Refactor unnecessary uses of CRM_Utils_Array::value
colemanw [Fri, 13 Oct 2023 23:44:50 +0000 (19:44 -0400)]
CRM/Mailing - Refactor unnecessary uses of CRM_Utils_Array::value

14 months agoMerge pull request #27797 from eileenmcnaughton/acl
Seamus Lee [Fri, 13 Oct 2023 23:48:33 +0000 (10:48 +1100)]
Merge pull request #27797 from eileenmcnaughton/acl

Move financial acl check on Main contribution page to the financial acl extension

14 months agoMerge pull request #27810 from eileenmcnaughton/move_test
colemanw [Fri, 13 Oct 2023 23:19:22 +0000 (19:19 -0400)]
Merge pull request #27810 from eileenmcnaughton/move_test

Move financial acl test to extension

14 months agoMerge pull request #27511 from agileware/CIVICRM-2174
colemanw [Fri, 13 Oct 2023 23:11:16 +0000 (19:11 -0400)]
Merge pull request #27511 from agileware/CIVICRM-2174

🔡 SearchKit, add case-sensitive pattern matching search operators using REGEXP BINARY and NOT REGEXP BINARY

14 months agoMove financial acl test to extension
Eileen McNaughton [Fri, 13 Oct 2023 22:38:21 +0000 (11:38 +1300)]
Move financial acl test to extension

14 months agoMerge pull request #27809 from colemanw/arrayCleanup
colemanw [Fri, 13 Oct 2023 22:12:52 +0000 (18:12 -0400)]
Merge pull request #27809 from colemanw/arrayCleanup

[NFC] Cleanup array syntax in tests directory

14 months agoCleanup array syntax in tests directory
colemanw [Fri, 13 Oct 2023 19:36:29 +0000 (15:36 -0400)]
Cleanup array syntax in tests directory

14 months agoMove financial acl check on Main contribution page to the extension
Eileen McNaughton [Thu, 12 Oct 2023 23:03:08 +0000 (12:03 +1300)]
Move financial acl check on Main contribution page to the extension

Note that after our snaffu with memberships I tested with the setting enabled & disabled

14 months agoCIVICRM-2174 SearchKit, add case-sensitive pattern matching search operator
Justin Freeman [Tue, 19 Sep 2023 07:25:58 +0000 (17:25 +1000)]
CIVICRM-2174 SearchKit, add case-sensitive pattern matching search operator

14 months agoMerge pull request #27806 from demeritcowboy/msgtpl-blank-content
colemanw [Fri, 13 Oct 2023 16:12:03 +0000 (12:12 -0400)]
Merge pull request #27806 from demeritcowboy/msgtpl-blank-content

Allow blank message templates

14 months agoMerge pull request #27791 from MegaphoneJon/fix-attachment-filenames
demeritcowboy [Fri, 13 Oct 2023 13:46:12 +0000 (09:46 -0400)]
Merge pull request #27791 from MegaphoneJon/fix-attachment-filenames

allow email attachments with unicode

14 months agoallow blank templates
demeritcowboy [Fri, 13 Oct 2023 13:03:45 +0000 (09:03 -0400)]
allow blank templates

14 months agoMerge pull request #27804 from seamuslee001/weight_deduperules
colemanw [Fri, 13 Oct 2023 12:55:54 +0000 (08:55 -0400)]
Merge pull request #27804 from seamuslee001/weight_deduperules

[REF] Fix Smarty Notices on Dedupe Rules screen by setting weight

14 months agoMerge pull request #27803 from colemanw/afformTest
Aidan Saunders [Fri, 13 Oct 2023 08:41:14 +0000 (09:41 +0100)]
Merge pull request #27803 from colemanw/afformTest

[NFC] Afform - Test cleanup

14 months agoMerge pull request #27785 from eileenmcnaughton/tokens_more
Yashodha Chaku [Fri, 13 Oct 2023 04:29:18 +0000 (09:59 +0530)]
Merge pull request #27785 from eileenmcnaughton/tokens_more

Add event.self_cancel_xfer tokens

14 months agoMerge pull request #27801 from eileenmcnaughton/aclly
Seamus Lee [Fri, 13 Oct 2023 03:48:41 +0000 (14:48 +1100)]
Merge pull request #27801 from eileenmcnaughton/aclly

Add ContributionFormTrait

14 months ago[REF] Fix Smarty Notices on Dedupe Rules screen by setting weight
Seamus Lee [Fri, 13 Oct 2023 03:43:07 +0000 (14:43 +1100)]
[REF] Fix Smarty Notices on Dedupe Rules screen by setting weight

14 months agoAdd ContributionFormTrait
Eileen McNaughton [Fri, 13 Oct 2023 02:22:53 +0000 (15:22 +1300)]
Add ContributionFormTrait

14 months agoMerge pull request #27802 from colemanw/copyEdits
Seamus Lee [Fri, 13 Oct 2023 03:10:14 +0000 (14:10 +1100)]
Merge pull request #27802 from colemanw/copyEdits

[NFC] Docblocks - Remove 'experimental' comments and other copy-edits

14 months agoAfform - Test cleanup
colemanw [Fri, 13 Oct 2023 02:42:56 +0000 (22:42 -0400)]
Afform - Test cleanup

14 months agoDocblocks - Remove 'experimental' comments and other copy-edits
colemanw [Fri, 13 Oct 2023 02:24:11 +0000 (22:24 -0400)]
Docblocks - Remove 'experimental' comments and other copy-edits

14 months agoMerge pull request #27799 from demeritcowboy/regen
Seamus Lee [Fri, 13 Oct 2023 02:25:26 +0000 (13:25 +1100)]
Merge pull request #27799 from demeritcowboy/regen

regen after #27784

14 months agoMerge pull request #27795 from eileenmcnaughton/notice_main
Eileen McNaughton [Fri, 13 Oct 2023 01:50:49 +0000 (14:50 +1300)]
Merge pull request #27795 from eileenmcnaughton/notice_main

Split shared function with mostly unshared code

14 months agoRemove now-always-true-param
Eileen McNaughton [Thu, 12 Oct 2023 22:23:17 +0000 (11:23 +1300)]
Remove now-always-true-param

14 months agoMove called functions with similar sharing issues into unshared code
Eileen McNaughton [Thu, 12 Oct 2023 22:14:51 +0000 (11:14 +1300)]
Move called functions with similar sharing issues into unshared code

14 months agoSplit shared function with mostly unshared code
Eileen McNaughton [Thu, 12 Oct 2023 21:11:14 +0000 (10:11 +1300)]
Split shared function with mostly unshared code

Almost all the code in this function is specific to the online form - we don't gain
much by sharing but it is harder to make changes because of
having to check the impact of each change on both forms.

Note both forms have test cover over this

14 months agoregen after #27784
demeritcowboy [Fri, 13 Oct 2023 00:48:49 +0000 (20:48 -0400)]
regen after #27784

14 months agoMerge pull request #27739 from eileenmcnaughton/no_assign
demeritcowboy [Fri, 13 Oct 2023 00:40:06 +0000 (20:40 -0400)]
Merge pull request #27739 from eileenmcnaughton/no_assign

Add push upgrade for event offline receipt

14 months agoMerge pull request #27792 from colemanw/userDashboard
colemanw [Thu, 12 Oct 2023 23:49:52 +0000 (19:49 -0400)]
Merge pull request #27792 from colemanw/userDashboard

Add user_dashboard core extension (alpha)

14 months agoMerge pull request #27796 from seamuslee001/fix_notice_survey_form
Eileen McNaughton [Thu, 12 Oct 2023 22:38:24 +0000 (11:38 +1300)]
Merge pull request #27796 from seamuslee001/fix_notice_survey_form

[REF] Fix notice error on undefined array key perm

14 months ago[REF] Fix notice error on undefined array key perm
Seamus Lee [Thu, 12 Oct 2023 21:43:46 +0000 (08:43 +1100)]
[REF] Fix notice error on undefined array key perm

14 months agoAdd user_dashboard core extension (alpha)
colemanw [Wed, 11 Oct 2023 23:23:44 +0000 (19:23 -0400)]
Add user_dashboard core extension (alpha)

Includes search displays to replace the user dashboard, minus the action links

14 months agoMerge pull request #27793 from colemanw/emptyOptions
Aidan Saunders [Thu, 12 Oct 2023 15:50:17 +0000 (16:50 +0100)]
Merge pull request #27793 from colemanw/emptyOptions

APIv4 - Prevent fatal errors when getOptions returns an empty array

14 months agoAPIv4 - Prevent fatal errors when getOptions returns an empty array
colemanw [Thu, 12 Oct 2023 14:06:01 +0000 (10:06 -0400)]
APIv4 - Prevent fatal errors when getOptions returns an empty array

14 months agoMerge pull request #27755 from colemanw/afformPlacement
Tim Otten [Thu, 12 Oct 2023 03:53:39 +0000 (20:53 -0700)]
Merge pull request #27755 from colemanw/afformPlacement

Afform - Unify 'is_dashlet', 'is_token' & 'contact_summary' as 'placement'

14 months agoMerge pull request #27784 from midtsveen/patch-2
Eileen McNaughton [Wed, 11 Oct 2023 22:46:29 +0000 (11:46 +1300)]
Merge pull request #27784 from midtsveen/patch-2

Update civicrm_state_province.tpl

14 months agoAdd push upgrade for event offline receipt
Eileen McNaughton [Fri, 6 Oct 2023 22:01:34 +0000 (11:01 +1300)]
Add push upgrade for event offline receipt

This follows our historical practice of doing push receipts by
- adding the relevant receipt to the array of template in the upgrade
notification and
- (optionally) noting deprecated params on CRM_Utils_Token::getDeprecatedTokens

I didn't add lineItem to the deprecated array as it is pretty legit
to assign that within a foreach loop.

I also removed the assigns for the variables which are no longer relevant -
this can be followed up with more tidy up (some of which resolves php8.x issues)

Note that the template still uses
$billingName & $address - resolved in
https://github.com/civicrm/civicrm-core/pull/27692
$customGroup - resolved in https://github.com/civicrm/civicrm-core/pull/27596
(actually the variable remains but becomes non-leaky)
$credit_card_date,$credit_card_type (I propose moving to a paymet token)
$credit_card_expiry (I propose removing)
$event.confirm_text - addressed in https://github.com/civicrm/civicrm-core/pull/27162

14 months agoallow email attachments with unicode
Jon Goldberg [Wed, 11 Oct 2023 22:21:15 +0000 (18:21 -0400)]
allow email attachments with unicode

14 months agoMerge pull request #27790 from civicrm/5.67
Eileen McNaughton [Wed, 11 Oct 2023 22:06:43 +0000 (11:06 +1300)]
Merge pull request #27790 from civicrm/5.67

5.67 to master

14 months agoMerge pull request #27788 from eileenmcnaughton/567_prem
Eileen McNaughton [Wed, 11 Oct 2023 22:05:45 +0000 (11:05 +1300)]
Merge pull request #27788 from eileenmcnaughton/567_prem

Add weights to premium screen

14 months agoUpdate civicrm_state_province.tpl
pmarg | Erik Midtsveen [Wed, 11 Oct 2023 21:42:35 +0000 (21:42 +0000)]
Update civicrm_state_province.tpl

,

14 months agoMerge pull request #27786 from eileenmcnaughton/api_func
Eileen McNaughton [Wed, 11 Oct 2023 21:11:05 +0000 (10:11 +1300)]
Merge pull request #27786 from eileenmcnaughton/api_func

Tag `getSubmittedValue()` as externally supported

14 months agoAdd weights to premium screen
Eileen McNaughton [Wed, 11 Oct 2023 21:05:17 +0000 (10:05 +1300)]
Add weights to premium screen

14 months agoMerge pull request #27776 from eileenmcnaughton/fix_localize
Seamus Lee [Wed, 11 Oct 2023 21:00:00 +0000 (08:00 +1100)]
Merge pull request #27776 from eileenmcnaughton/fix_localize

Update smarty localize for Smarty3

14 months agoTag getSubmittedValue as externally supported
Eileen McNaughton [Wed, 11 Oct 2023 19:50:24 +0000 (08:50 +1300)]
Tag getSubmittedValue as externally supported

14 months agoRemove irrelevant code from previously shared form
Eileen McNaughton [Wed, 11 Oct 2023 20:18:11 +0000 (09:18 +1300)]
Remove irrelevant code from previously shared form

14 months agoMerge pull request #27733 from eileenmcnaughton/no_text_offline
colemanw [Wed, 11 Oct 2023 19:59:36 +0000 (15:59 -0400)]
Merge pull request #27733 from eileenmcnaughton/no_text_offline

Blank out the text version of the offline receipt template

14 months agoAdd self_cancel_xfer tokens
Eileen McNaughton [Wed, 11 Oct 2023 19:15:57 +0000 (08:15 +1300)]
Add self_cancel_xfer tokens

14 months agoUpdate civicrm_state_province.tpl
pmarg | Erik Midtsveen [Wed, 11 Oct 2023 18:48:05 +0000 (18:48 +0000)]
Update civicrm_state_province.tpl

. = ,

14 months agoUpdate civicrm_state_province.tpl
pmarg | Erik Midtsveen [Wed, 11 Oct 2023 18:08:18 +0000 (18:08 +0000)]
Update civicrm_state_province.tpl

14 months agoAfform - Unify 'is_dashlet', 'is_token' & 'contact_summary' as 'placement'
colemanw [Sun, 8 Oct 2023 08:14:29 +0000 (04:14 -0400)]
Afform - Unify 'is_dashlet', 'is_token' & 'contact_summary' as 'placement'

Gathering these items into an option group makes future placement
options easy to add, and easy for other extensions to contribute to.

14 months agoMerge pull request #27767 from herbdool/standalone-forgot-pass
Mathieu Lu [Wed, 11 Oct 2023 13:24:44 +0000 (09:24 -0400)]
Merge pull request #27767 from herbdool/standalone-forgot-pass

Add translation tags

14 months agoAdd translation tags
Herb [Tue, 10 Oct 2023 14:25:17 +0000 (10:25 -0400)]
Add translation tags

14 months agoMerge pull request #27778 from eileenmcnaughton/standalone
colemanw [Wed, 11 Oct 2023 11:29:07 +0000 (07:29 -0400)]
Merge pull request #27778 from eileenmcnaughton/standalone

Standalone Smarty3 support

14 months agoMerge pull request #27780 from eileenmcnaughton/567_pcp
Yashodha Chaku [Wed, 11 Oct 2023 10:42:16 +0000 (16:12 +0530)]
Merge pull request #27780 from eileenmcnaughton/567_pcp

Add some weights to pcp page

14 months agoSmarty3 compatibilty with Contribution Amount tab
Eileen McNaughton [Wed, 11 Oct 2023 06:46:30 +0000 (19:46 +1300)]
Smarty3 compatibilty with Contribution Amount tab

14 months agoMerge pull request #27779 from totten/master-phpstorm-routes
Eileen McNaughton [Wed, 11 Oct 2023 06:45:09 +0000 (19:45 +1300)]
Merge pull request #27779 from totten/master-phpstorm-routes

phpstorm - Generate hints for Civi::paths(), Civi::url(), CRM_Utils_System::url()

14 months agoAdd some weights to pcp page
Eileen McNaughton [Wed, 11 Oct 2023 05:33:31 +0000 (18:33 +1300)]
Add some weights to pcp page

14 months agophpstorm - Generate hints for Civi::paths()
Tim Otten [Wed, 11 Oct 2023 03:14:13 +0000 (20:14 -0700)]
phpstorm - Generate hints for Civi::paths()

14 months agophpstorm - Generate hints for Civi::url() and CRM_Utils_System::url()
Tim Otten [Wed, 11 Oct 2023 03:13:48 +0000 (20:13 -0700)]
phpstorm - Generate hints for Civi::url() and CRM_Utils_System::url()

14 months agoMerge pull request #27765 from eileenmcnaughton/create_address
demeritcowboy [Wed, 11 Oct 2023 02:10:41 +0000 (22:10 -0400)]
Merge pull request #27765 from eileenmcnaughton/create_address

Stop passing variable no longer in signature

14 months agoStandalone Smarty3 support
Eileen McNaughton [Wed, 11 Oct 2023 02:03:35 +0000 (15:03 +1300)]
Standalone Smarty3 support

14 months agoUpdate smarty localize for Smarty3
Eileen McNaughton [Wed, 11 Oct 2023 01:50:09 +0000 (14:50 +1300)]
Update smarty localize for Smarty3

14 months agoMerge pull request #27773 from eileenmcnaughton/pledge_smart
Eileen McNaughton [Wed, 11 Oct 2023 01:40:59 +0000 (14:40 +1300)]
Merge pull request #27773 from eileenmcnaughton/pledge_smart

Fix notice on New Pledge form

14 months agoMerge pull request #27771 from eileenmcnaughton/567
colemanw [Wed, 11 Oct 2023 01:20:22 +0000 (21:20 -0400)]
Merge pull request #27771 from eileenmcnaughton/567

Do not run financial acls if the setting it not set

14 months agoFix notice on New Pledge form
Eileen McNaughton [Wed, 11 Oct 2023 00:58:07 +0000 (13:58 +1300)]
Fix notice on New Pledge form

14 months agoDo not run financial acls if the setting it not set
Eileen McNaughton [Wed, 11 Oct 2023 00:36:22 +0000 (13:36 +1300)]
Do not run financial acls if the setting it not set

Yeah - continues a fugly fix - but it's quick & works

14 months agoMerge pull request #27769 from systopia/fix_php_undefines_property
Eileen McNaughton [Tue, 10 Oct 2023 21:58:39 +0000 (10:58 +1300)]
Merge pull request #27769 from systopia/fix_php_undefines_property

[PHP 8.2] fix undefined property in CRM_Event_Form_SelfSvcUpdate

14 months agoMerge pull request #27766 from colemanw/quickSearchEmployer
colemanw [Tue, 10 Oct 2023 21:45:00 +0000 (17:45 -0400)]
Merge pull request #27766 from colemanw/quickSearchEmployer

QuickSearch - Add Current Employer option

14 months agophp 7 compliance
Jo Franz [Tue, 10 Oct 2023 21:13:56 +0000 (23:13 +0200)]
php 7 compliance

14 months agoPHP 8 fix undefines_property
Jo Franz [Tue, 10 Oct 2023 20:10:53 +0000 (22:10 +0200)]
PHP 8 fix undefines_property

14 months agoMerge pull request #27763 from eileenmcnaughton/blank_text
colemanw [Tue, 10 Oct 2023 19:38:40 +0000 (15:38 -0400)]
Merge pull request #27763 from eileenmcnaughton/blank_text

Fix Participant form test to correctly test html version

14 months agoQuickSearch - Add Current Employer option
colemanw [Tue, 10 Oct 2023 14:20:26 +0000 (10:20 -0400)]
QuickSearch - Add Current Employer option

14 months agoMerge pull request #27722 from colemanw/civiCaseSelectWhereClause
colemanw [Tue, 10 Oct 2023 13:09:12 +0000 (09:09 -0400)]
Merge pull request #27722 from colemanw/civiCaseSelectWhereClause

CiviCase - Fix SelectWhereClause for Activity queries

14 months agoMerge pull request #27652 from MegaphoneJon/faster-verp
Tim Otten [Tue, 10 Oct 2023 07:32:03 +0000 (00:32 -0700)]
Merge pull request #27652 from MegaphoneJon/faster-verp

CiviMail - Speed up generation of VERP URLs

14 months agoActivityTest - Fix tearDown to prevent test leakage
colemanw [Tue, 10 Oct 2023 00:34:10 +0000 (20:34 -0400)]
ActivityTest - Fix tearDown to prevent test leakage

14 months agoStop passing variable no longer in signature
Eileen McNaughton [Mon, 9 Oct 2023 21:30:34 +0000 (10:30 +1300)]
Stop passing variable no longer in signature

14 months agoFix Participant form test to correctly test html version
Eileen McNaughton [Mon, 9 Oct 2023 20:20:59 +0000 (09:20 +1300)]
Fix Participant form test to correctly test html version

We were checking for text that is present on the text version - but not the html.

In this case the html version is right - ie we only show paid amount & balance if
relevant  - ie if part payment has been made. If it is all paid or all unpaid we don't

14 months agoMerge pull request #27759 from braders/paypalipn-exception
colemanw [Sun, 8 Oct 2023 14:34:04 +0000 (10:34 -0400)]
Merge pull request #27759 from braders/paypalipn-exception

Fix message within exception (PayPalIPN)

14 months agoMerge pull request #27758 from braders/proper-null
colemanw [Sun, 8 Oct 2023 14:33:24 +0000 (10:33 -0400)]
Merge pull request #27758 from braders/proper-null

[NFC] Make null really null

14 months agoMerge pull request #27757 from braders/remove-method-getEmailAddress
colemanw [Sun, 8 Oct 2023 13:54:08 +0000 (09:54 -0400)]
Merge pull request #27757 from braders/remove-method-getEmailAddress

[REF] Remove getEmailAddress method which cannot work

14 months agoMerge pull request #27756 from braders/renewOptionLocalVariable
colemanw [Sun, 8 Oct 2023 13:52:15 +0000 (09:52 -0400)]
Merge pull request #27756 from braders/renewOptionLocalVariable

[REF][PHP8.2] Replace dynmaic property with variable

14 months agoFix message within exception (PayPalIPN)
Bradley Taylor [Sun, 8 Oct 2023 10:30:16 +0000 (11:30 +0100)]
Fix message within exception (PayPalIPN)

14 months ago[NFC] Make null really null
Bradley Taylor [Sun, 8 Oct 2023 10:21:13 +0000 (11:21 +0100)]
[NFC] Make null really null

14 months ago[REF] Remove getEmailAddress method which cannot work
Bradley Taylor [Sun, 8 Oct 2023 10:12:31 +0000 (11:12 +0100)]
[REF] Remove getEmailAddress method which cannot work

14 months ago[REF][PHP8.2] Replace dynmaic property with variable
Bradley Taylor [Sun, 8 Oct 2023 10:06:13 +0000 (11:06 +0100)]
[REF][PHP8.2] Replace dynmaic property with variable

14 months agoCore/ext - Remove unnecessary default values from packaged Afforms
colemanw [Sun, 8 Oct 2023 08:13:58 +0000 (04:13 -0400)]
Core/ext - Remove unnecessary default values from packaged Afforms

14 months agoMerge pull request #27753 from civicrm/5.67
Eileen McNaughton [Sat, 7 Oct 2023 21:29:29 +0000 (10:29 +1300)]
Merge pull request #27753 from civicrm/5.67

5.67 to master

14 months agoMerge pull request #27751 from braders/unused-var
Eileen McNaughton [Sat, 7 Oct 2023 21:27:21 +0000 (10:27 +1300)]
Merge pull request #27751 from braders/unused-var

[NFC] Remove unused var

14 months agoFix Activity ACL clause generation
colemanw [Sat, 7 Oct 2023 17:30:12 +0000 (13:30 -0400)]
Fix Activity ACL clause generation

Regression was caused by  918e583a146876fb42932a1d959796fd710b7b74 updating DAO::getSelectWhereClause
but not CRM_Contact_BAO_Query::generatePermissionClause. Turns out the code was being duplicated and
the latter could just call the former.

14 months agoFix tests not setting permissions properly
colemanw [Fri, 6 Oct 2023 18:45:01 +0000 (14:45 -0400)]
Fix tests not setting permissions properly

14 months agoDAO - Handle OR clauses in getDynamicFkAclClauses, improve sql formatting for readability
colemanw [Thu, 5 Oct 2023 18:01:25 +0000 (14:01 -0400)]
DAO - Handle OR clauses in getDynamicFkAclClauses, improve sql formatting for readability

Follow-up to 918e583a146876fb42932a1d959796fd710b7b74 - this correctly joins sub-arrays using OR