civicrm-core.git
2 years agoMerge pull request #22036 from eileenmcnaughton/notice
Eileen McNaughton [Thu, 11 Nov 2021 04:10:35 +0000 (17:10 +1300)]
Merge pull request #22036 from eileenmcnaughton/notice

Escape-on-output-proof enotice fixes

2 years agoMerge pull request #22034 from seamuslee001/dashboard_followup_fix
Eileen McNaughton [Thu, 11 Nov 2021 03:05:15 +0000 (16:05 +1300)]
Merge pull request #22034 from seamuslee001/dashboard_followup_fix

[NFC] Additional Fix on UserDashBoard Tests to assign action value to…

2 years agoMerge pull request #22033 from eileenmcnaughton/quick
Eileen McNaughton [Thu, 11 Nov 2021 01:46:29 +0000 (14:46 +1300)]
Merge pull request #22033 from eileenmcnaughton/quick

Do not smarty encode quicksearch html

2 years agoEscape-on-output-proof enotice fixes
Eileen McNaughton [Thu, 11 Nov 2021 00:04:58 +0000 (13:04 +1300)]
Escape-on-output-proof enotice fixes

2 years agoMerge pull request #22019 from colemanw/searchKitLoading
Eileen McNaughton [Wed, 10 Nov 2021 23:59:33 +0000 (12:59 +1300)]
Merge pull request #22019 from colemanw/searchKitLoading

SearchKit - Animated loading skeleton

2 years ago[NFC] Additional Fix on UserDashBoard Tests to assign action value to dashboard
Seamus Lee [Wed, 10 Nov 2021 23:40:37 +0000 (23:40 +0000)]
[NFC] Additional Fix on UserDashBoard Tests to assign action value to dashboard

2 years agoMerge pull request #22025 from demeritcowboy/aggregate-smarty2
Eileen McNaughton [Wed, 10 Nov 2021 23:07:34 +0000 (12:07 +1300)]
Merge pull request #22025 from demeritcowboy/aggregate-smarty2

dev/report#77 - Smarty warning about relationship in contribute/history civireport

2 years agoMerge pull request #22024 from demeritcowboy/aggregate-weird
Eileen McNaughton [Wed, 10 Nov 2021 23:06:46 +0000 (12:06 +1300)]
Merge pull request #22024 from demeritcowboy/aggregate-weird

[NFC] dev/report#77 - Remove useless comment in contribute/history civireport

2 years agoDo not smarty encode quicksearch html
Eileen McNaughton [Sun, 31 Oct 2021 21:49:34 +0000 (10:49 +1300)]
Do not smarty encode quicksearch html

2 years agoMerge pull request #22029 from eileenmcnaughton/action_set
Eileen McNaughton [Wed, 10 Nov 2021 22:47:05 +0000 (11:47 +1300)]
Merge pull request #22029 from eileenmcnaughton/action_set

Ensure action is set when loading contactFooter

2 years agoMerge pull request #21986 from colemanw/searchKitTabs
Eileen McNaughton [Wed, 10 Nov 2021 22:45:25 +0000 (11:45 +1300)]
Merge pull request #21986 from colemanw/searchKitTabs

SearchKit - tabbed display for custom vs packaged searches

2 years agoMerge pull request #22028 from eileenmcnaughton/issetinfo
Eileen McNaughton [Wed, 10 Nov 2021 22:28:30 +0000 (11:28 +1300)]
Merge pull request #22028 from eileenmcnaughton/issetinfo

Remove use of isset for info.tpl

2 years agoMerge pull request #22027 from braders/fix-graph-empty-logic
Eileen McNaughton [Wed, 10 Nov 2021 21:28:53 +0000 (10:28 +1300)]
Merge pull request #22027 from braders/fix-graph-empty-logic

Flip logic for determining if $section variable is set.

2 years agoEnsure action is set when loading contactFooter
Eileen McNaughton [Wed, 10 Nov 2021 20:18:10 +0000 (09:18 +1300)]
Ensure action is set when loading contactFooter

2 years agoRemove use of isset for info.tpl
Eileen McNaughton [Wed, 10 Nov 2021 19:57:46 +0000 (08:57 +1300)]
Remove use of isset for info.tpl

2 years agoMerge pull request #22023 from demeritcowboy/php8-userdashboard
Seamus Lee [Wed, 10 Nov 2021 19:55:15 +0000 (06:55 +1100)]
Merge pull request #22023 from demeritcowboy/php8-userdashboard

[NFC] php8 - fix test fails for CRM_Contact_Page_View_UserDashBoardTest

2 years agoMerge pull request #22026 from mattwire/lockmessages
Seamus Lee [Wed, 10 Nov 2021 19:52:47 +0000 (06:52 +1100)]
Merge pull request #22026 from mattwire/lockmessages

REF: Switch to debug level logging for lock debugging

2 years agoEnotice fix for footer.tpl
Eileen McNaughton [Sat, 6 Nov 2021 00:03:30 +0000 (13:03 +1300)]
Enotice fix for footer.tpl

Ensure that contactId is always present

2 years agoFlip logic for determining if $section variable is set.
Bradley Taylor [Wed, 10 Nov 2021 19:23:40 +0000 (19:23 +0000)]
Flip logic for determining if $section variable is set.

Previously empty() function calls were added in order to provide PHP8 compatiability,
however, the logic commited was back-to-front.

This broke the ability to display pie and bar charts for those reports which support them.

2 years agoMerge pull request #22017 from lcdservices/dev-core-1529
Monish Deb [Wed, 10 Nov 2021 17:28:42 +0000 (22:58 +0530)]
Merge pull request #22017 from lcdservices/dev-core-1529

dev/core#1529 fix event repeat functionality

2 years agoSwitch to debug level logging for lock debugging
Matthew Wire [Wed, 10 Nov 2021 16:51:11 +0000 (16:51 +0000)]
Switch to debug level logging for lock debugging

2 years agosmarty warning
demeritcowboy [Wed, 10 Nov 2021 16:07:32 +0000 (11:07 -0500)]
smarty warning

2 years agoremove useless comment
demeritcowboy [Wed, 10 Nov 2021 16:00:26 +0000 (11:00 -0500)]
remove useless comment

2 years agoassign formTpl
demeritcowboy [Wed, 10 Nov 2021 15:28:12 +0000 (10:28 -0500)]
assign formTpl

2 years agoMerge pull request #22000 from eileenmcnaughton/body
demeritcowboy [Wed, 10 Nov 2021 14:19:19 +0000 (09:19 -0500)]
Merge pull request #22000 from eileenmcnaughton/body

Ensure beginHookFormElements is assigned

2 years agoMerge pull request #22021 from totten/master-ischildpath
demeritcowboy [Wed, 10 Nov 2021 14:16:18 +0000 (09:16 -0500)]
Merge pull request #22021 from totten/master-ischildpath

CRM_Utils_File::isChildPath - Fix checking of non-existent paths

2 years agoMerge pull request #22020 from seamuslee001/nfc_payment_test_fix
Eileen McNaughton [Wed, 10 Nov 2021 05:22:09 +0000 (18:22 +1300)]
Merge pull request #22020 from seamuslee001/nfc_payment_test_fix

[NFC] Fix test issue about trying to do array offset on NULL in Payme…

2 years agoMerge pull request #22015 from demeritcowboy/test-histreport
Seamus Lee [Wed, 10 Nov 2021 04:32:30 +0000 (15:32 +1100)]
Merge pull request #22015 from demeritcowboy/test-histreport

[NFC] dev/report#77 - contribute/history civireport seems ok to run during reporttemplatetest

2 years agoCRM_Utils_File::isChildPath - Fix checking of non-existent paths
Tim Otten [Wed, 10 Nov 2021 02:31:05 +0000 (18:31 -0800)]
CRM_Utils_File::isChildPath - Fix checking of non-existent paths

Suppose you use call `isChildPath()` with these options:

* `$parent='/nonexistent'`
* `$child='/home/me/exists.txt'`
* `$checkRealPath=TRUE`

Before
=====

Reports that `/home/me/exists.txt` is a child of `/nonexistent`

After
=====

Reports that `/home/me/exists.txt` is NOT a child of `/nonexistent`

Comments
========

I added six test cases for how `isChildPath()` behaves when using
`$checkRealPath=TRUE`.  The first five cases behave the same with or without
the patch.  The patch fixes the last case.

2 years ago[NFC] Fix test issue about trying to do array offset on NULL in Payment ProcessorFormTest
Seamus Lee [Wed, 10 Nov 2021 02:46:33 +0000 (02:46 +0000)]
[NFC] Fix test issue about trying to do array offset on NULL in Payment ProcessorFormTest

2 years agoreport seems fine now
demeritcowboy [Tue, 9 Nov 2021 23:35:03 +0000 (18:35 -0500)]
report seems fine now

2 years agoMerge pull request #22018 from demeritcowboy/php8-formtpl
colemanw [Wed, 10 Nov 2021 02:18:21 +0000 (21:18 -0500)]
Merge pull request #22018 from demeritcowboy/php8-formtpl

Ensure smarty variable formTpl is set

2 years agoMerge pull request #22001 from eileenmcnaughton/hook
demeritcowboy [Wed, 10 Nov 2021 02:15:41 +0000 (21:15 -0500)]
Merge pull request #22001 from eileenmcnaughton/hook

Ensure hookContentPlacement is assigned

2 years agoMerge pull request #22016 from demeritcowboy/histreport-entryfound
Seamus Lee [Wed, 10 Nov 2021 01:46:50 +0000 (12:46 +1100)]
Merge pull request #22016 from demeritcowboy/histreport-entryfound

dev/report#77 - Unused variable in contribute/history civireport

2 years agoSearchKit - Animated loading skeleton
Coleman Watts [Wed, 10 Nov 2021 00:43:34 +0000 (19:43 -0500)]
SearchKit - Animated loading skeleton

2 years agoalways set formTpl
demeritcowboy [Wed, 10 Nov 2021 00:16:47 +0000 (19:16 -0500)]
always set formTpl

2 years agodev/core#1529 fix event repeat functionality
Brian Shaughnessy [Wed, 10 Nov 2021 00:12:10 +0000 (19:12 -0500)]
dev/core#1529 fix event repeat functionality

2 years agounused variable
demeritcowboy [Tue, 9 Nov 2021 23:41:34 +0000 (18:41 -0500)]
unused variable

2 years agoMerge pull request #21991 from eileenmcnaughton/isset4
Seamus Lee [Tue, 9 Nov 2021 22:33:49 +0000 (09:33 +1100)]
Merge pull request #21991 from eileenmcnaughton/isset4

Ensure that keys are set in tabValues before hitting smarty

2 years agoMerge pull request #22002 from eileenmcnaughton/group_org
Seamus Lee [Tue, 9 Nov 2021 22:32:55 +0000 (09:32 +1100)]
Merge pull request #22002 from eileenmcnaughton/group_org

Extract getGroupOrganizationUrl & ensure always assigned

2 years agoMerge pull request #22008 from artfulrobot/artfulrobot-fix-mailing-click-report-url
Seamus Lee [Tue, 9 Nov 2021 22:31:39 +0000 (09:31 +1100)]
Merge pull request #22008 from artfulrobot/artfulrobot-fix-mailing-click-report-url

Fix unencoded mailing url query param in Mailing report

2 years agoMerge pull request #22011 from jmcclelland/surveyprevnext
Eileen McNaughton [Tue, 9 Nov 2021 21:01:48 +0000 (10:01 +1300)]
Merge pull request #22011 from jmcclelland/surveyprevnext

don't overfill the prevnext cache when reserving for a survey.

2 years agoMerge pull request #21983 from lisandro-compucorp/email_to_organizations
demeritcowboy [Tue, 9 Nov 2021 15:22:15 +0000 (10:22 -0500)]
Merge pull request #21983 from lisandro-compucorp/email_to_organizations

Handle activity creation for emails directed to organization contacts

2 years agoMerge pull request #22010 from colemanw/apiExplorerFormat
demeritcowboy [Tue, 9 Nov 2021 00:20:49 +0000 (19:20 -0500)]
Merge pull request #22010 from colemanw/apiExplorerFormat

APIv4 Explorer - Optionally view results in PHP format

2 years agoMerge pull request #22005 from seamuslee001/update_province_philippines
demeritcowboy [Mon, 8 Nov 2021 23:59:14 +0000 (18:59 -0500)]
Merge pull request #22005 from seamuslee001/update_province_philippines

[REF] Add in missing province for Philippines and update names to matc…

2 years ago[REF] Add in missing province for Philippines and update names to match ISO
Seamus Lee [Mon, 8 Nov 2021 01:54:07 +0000 (12:54 +1100)]
[REF] Add in missing province for Philippines and update names to match ISO

Ensure we don't overwrite any customisations already in the database

2 years agoAPIv4 Explorer - Optionally view results in PHP format
Coleman Watts [Mon, 8 Nov 2021 19:03:49 +0000 (14:03 -0500)]
APIv4 Explorer - Optionally view results in PHP format

2 years agodon't overfill the prevnext cache when reserving for a survey.
Jamie McClelland [Mon, 8 Nov 2021 19:19:06 +0000 (14:19 -0500)]
don't overfill the prevnext cache when reserving for a survey.

2 years agoFix unencoded mailing url query param in Mailing report
Rich Lott / Artful Robot [Mon, 8 Nov 2021 14:31:14 +0000 (14:31 +0000)]
Fix unencoded mailing url query param in Mailing report

2 years agoHandle activity creation for emails to organization contacts
Tano Rojas [Fri, 5 Nov 2021 09:05:26 +0000 (16:05 +0700)]
Handle activity creation for emails to organization contacts

2 years agoMerge pull request #22003 from civicrm/5.44
Seamus Lee [Mon, 8 Nov 2021 04:09:42 +0000 (15:09 +1100)]
Merge pull request #22003 from civicrm/5.44

5.44

2 years agoMerge pull request #21960 from colemanw/afformBaseModule
Tim Otten [Mon, 8 Nov 2021 02:48:15 +0000 (18:48 -0800)]
Merge pull request #21960 from colemanw/afformBaseModule

Afform - Display the extension in which an Afform is packaged

2 years agoMerge pull request #21997 from colemanw/fixUpgradeErrors
Seamus Lee [Sun, 7 Nov 2021 23:56:18 +0000 (10:56 +1100)]
Merge pull request #21997 from colemanw/fixUpgradeErrors

dev/core#2550 Fix possible upgrade failures

2 years agoExtract getGroupOrganizationUrl & ensure always assigned
Eileen McNaughton [Sun, 7 Nov 2021 22:55:14 +0000 (11:55 +1300)]
Extract getGroupOrganizationUrl & ensure always assigned

2 years agoEnsure that keys are set in tabValues before hitting smarty
Eileen McNaughton [Sat, 6 Nov 2021 00:07:49 +0000 (13:07 +1300)]
Ensure that keys are set in tabValues before hitting smarty

2 years agoEnsure hookContentPlacement is assigned
Eileen McNaughton [Sun, 7 Nov 2021 22:34:14 +0000 (11:34 +1300)]
Ensure hookContentPlacement is assigned

2 years agoMerge pull request #20811 from elcapo/billing-fields
Eileen McNaughton [Sun, 7 Nov 2021 22:27:54 +0000 (11:27 +1300)]
Merge pull request #20811 from elcapo/billing-fields

Check the billing fields returned by each payment processor

2 years agoEnsure beginHookFormElements is assigned
Eileen McNaughton [Sun, 7 Nov 2021 22:26:15 +0000 (11:26 +1300)]
Ensure beginHookFormElements is assigned

This ensures the variable is assigned & hence does not enotice with escape on output

2 years agoMerge pull request #21995 from braders/title-attr-tidyup
colemanw [Sun, 7 Nov 2021 21:07:11 +0000 (16:07 -0500)]
Merge pull request #21995 from braders/title-attr-tidyup

Tidy up title attributes

2 years agoTidy up title attributes
Bradley Taylor [Sat, 6 Nov 2021 16:26:24 +0000 (16:26 +0000)]
Tidy up title attributes
Wrap text in {ts} as appropriate (for translation)
Remove poorly worded or superflous title attributes

2 years agoMerge pull request #21998 from webmaster-cses-org-uk/patch-3
Monish Deb [Sun, 7 Nov 2021 15:37:05 +0000 (21:07 +0530)]
Merge pull request #21998 from webmaster-cses-org-uk/patch-3

Guard against passing empty values to CRM_Core_DAO::getFieldValue()

2 years agoMerge pull request #21975 from MegaphoneJon/reporting-18
colemanw [Sun, 7 Nov 2021 14:54:54 +0000 (09:54 -0500)]
Merge pull request #21975 from MegaphoneJon/reporting-18

Reporting #18: Fix sorting with > 10 participant roles

2 years agoMerge pull request #21940 from eileenmcnaughton/debug
demeritcowboy [Sun, 7 Nov 2021 13:53:18 +0000 (08:53 -0500)]
Merge pull request #21940 from eileenmcnaughton/debug

Enotice fixes in debug.tpl that are compatible with default escaping

2 years agoMerge pull request #21979 from eileenmcnaughton/vars
demeritcowboy [Sun, 7 Nov 2021 13:52:13 +0000 (08:52 -0500)]
Merge pull request #21979 from eileenmcnaughton/vars

Fix isForm to be always assigned, remove checks

2 years agoGuard against passing empty values to CRM_Core_DAO::getFieldValue()
Adam Wood [Sun, 7 Nov 2021 13:09:31 +0000 (13:09 +0000)]
Guard against passing empty values to CRM_Core_DAO::getFieldValue()

This change removes a potential "getFieldValue failed" error that can be thrown if an empty scalar value occurs in a multiple-contact reference custom field.

See https://lab.civicrm.org/dev/core/-/issues/2939

Replaces https://github.com/eileenmcnaughton/civicrm-core/pull/13/commits which was opened against the wrong repo.

2 years agoMerge pull request #21994 from braders/more-hardcoded-strings
Seamus Lee [Sat, 6 Nov 2021 22:22:27 +0000 (09:22 +1100)]
Merge pull request #21994 from braders/more-hardcoded-strings

Make more hardcoded strings available for translation

2 years agoFix possible upgrade failures when writing to db fields which may not yet exist
Coleman Watts [Sat, 6 Nov 2021 21:47:43 +0000 (17:47 -0400)]
Fix possible upgrade failures when writing to db fields which may not yet exist

Fixes dev/core#2550

2 years agoMerge pull request #21933 from eileenmcnaughton/local
demeritcowboy [Sat, 6 Nov 2021 18:03:31 +0000 (14:03 -0400)]
Merge pull request #21933 from eileenmcnaughton/local

Remove unused variable

2 years agoMake more hardcoded strings available for translation
Bradley Taylor [Sat, 6 Nov 2021 12:05:17 +0000 (12:05 +0000)]
Make more hardcoded strings available for translation

2 years agoMerge pull request #21988 from eileenmcnaughton/isset2
colemanw [Sat, 6 Nov 2021 03:44:14 +0000 (23:44 -0400)]
Merge pull request #21988 from eileenmcnaughton/isset2

Remove isset from Datasource.tpl

2 years agoMerge pull request #21987 from eileenmcnaughton/enotice
demeritcowboy [Fri, 5 Nov 2021 23:27:25 +0000 (19:27 -0400)]
Merge pull request #21987 from eileenmcnaughton/enotice

Enotice fixes

2 years agoMerge pull request #21956 from eileenmcnaughton/escape2
demeritcowboy [Fri, 5 Nov 2021 23:26:57 +0000 (19:26 -0400)]
Merge pull request #21956 from eileenmcnaughton/escape2

dev/core#1328 Add define to optionally enable escape-on-output

2 years agoMerge pull request #21990 from civicrm/5.44
Eileen McNaughton [Fri, 5 Nov 2021 22:59:34 +0000 (11:59 +1300)]
Merge pull request #21990 from civicrm/5.44

5.44 to master

2 years agoMerge pull request #21985 from colemanw/searchImageFix
Eileen McNaughton [Fri, 5 Nov 2021 22:13:17 +0000 (11:13 +1300)]
Merge pull request #21985 from colemanw/searchImageFix

[Unreleased regression] SearchKit - Fix display of image fields

2 years agoRemove isset from Datasource.tpl
Eileen McNaughton [Fri, 5 Nov 2021 21:12:15 +0000 (10:12 +1300)]
Remove isset from Datasource.tpl

This comes up on the first import contact screen

2 years agoEnotice fixes
Eileen McNaughton [Fri, 5 Nov 2021 20:43:19 +0000 (09:43 +1300)]
Enotice fixes

2 years agoAdd define to optionally enable escape-on-output
Eileen McNaughton [Mon, 1 Nov 2021 21:04:56 +0000 (10:04 +1300)]
Add define to optionally enable escape-on-output

This adjusts the smarty class such that if you have the define below
escape-on-output is enabled

This PR + fixing the use of isset in the template layer are the pre-requisites for
turning escape on output on and off. Keeping this part in an unmerged branch is
tricky as the templates need to be recompiled when you switch to a branch
which does not have this function

I envisage us starting to use this define in our dev environments fairly soon
as it's working well locally for me on
https://github.com/civicrm/civicrm-core/pull/21935

2 years agoAfformAdmin - Show counts in tab header
Coleman Watts [Fri, 5 Nov 2021 20:17:06 +0000 (16:17 -0400)]
AfformAdmin - Show counts in tab header

2 years agoSearchKit - tabbed display for custom vs packaged searches
Coleman Watts [Fri, 5 Nov 2021 19:49:28 +0000 (15:49 -0400)]
SearchKit - tabbed display for custom vs packaged searches

Splits the SearchKit admin UI in to 2 tabs - one for custom (locally-defined) searches,
and one for packaged searches. Adds a "revert" button for packaged searches.

2 years agoSearchKit - Fix display of image fields
Coleman Watts [Fri, 5 Nov 2021 18:39:05 +0000 (14:39 -0400)]
SearchKit - Fix display of image fields

2 years agoMerge pull request #21835 from wmortada/patch-1
Mathieu Lu [Fri, 5 Nov 2021 15:36:40 +0000 (11:36 -0400)]
Merge pull request #21835 from wmortada/patch-1

Run scheduled reminder job hourly

2 years agoMerge pull request #21982 from civicrm/5.44
Seamus Lee [Fri, 5 Nov 2021 07:28:39 +0000 (18:28 +1100)]
Merge pull request #21982 from civicrm/5.44

5.44

2 years agoMerge pull request #21980 from eileenmcnaughton/544
Seamus Lee [Fri, 5 Nov 2021 04:56:50 +0000 (15:56 +1100)]
Merge pull request #21980 from eileenmcnaughton/544

dev/core#2942 regression fix

2 years agoMerge pull request #21977 from colemanw/fixSearchKitPermissions
Seamus Lee [Fri, 5 Nov 2021 03:17:37 +0000 (14:17 +1100)]
Merge pull request #21977 from colemanw/fixSearchKitPermissions

SearchKit - Fix permission to access default display and download spreadsheets

2 years agodev/core#2942 regression fix
Eileen McNaughton [Fri, 5 Nov 2021 02:41:13 +0000 (15:41 +1300)]
dev/core#2942 regression fix

2 years agoFix isForm to be always assigned, remove checks
Eileen McNaughton [Fri, 5 Nov 2021 01:59:47 +0000 (14:59 +1300)]
Fix isForm to be always assigned, remove checks

Note I'm not seeing any regressions on this locally with enotice turned on - but the
worst case, if tests pass, is we get some enotices back in a scenario where we
are only impacting bleeding edge devs

2 years agoEnotice fixes in debug.tpl that are compatible with default escaping
Eileen McNaughton [Fri, 29 Oct 2021 20:15:29 +0000 (09:15 +1300)]
Enotice fixes in debug.tpl that are compatible with default escaping

2 years agoReporting #18: Fix sorting with > 10 participant roles
Jon Goldberg [Thu, 4 Nov 2021 17:01:36 +0000 (13:01 -0400)]
Reporting #18: Fix sorting with > 10 participant roles

2 years agoMerge pull request #21912 from eileenmcnaughton/no_display
Seamus Lee [Thu, 4 Nov 2021 21:46:07 +0000 (08:46 +1100)]
Merge pull request #21912 from eileenmcnaughton/no_display

Move responsibilty for ensuring greeting parameters are set to `ensureGreetingParamsAreSet`

2 years agoMerge pull request #21976 from civicrm/5.44
demeritcowboy [Thu, 4 Nov 2021 20:10:02 +0000 (16:10 -0400)]
Merge pull request #21976 from civicrm/5.44

5.44

2 years agoSearchKit - Fix permission to access default display and download spreadsheets
Coleman Watts [Thu, 4 Nov 2021 19:42:31 +0000 (15:42 -0400)]
SearchKit - Fix permission to access default display and download spreadsheets

Intentionally setting these gatekeeper permissions fairly open as all of these actions
perform stricter permission checks internally.

2 years agoMerge pull request #21974 from christianwach/lab-core-2909-2
demeritcowboy [Thu, 4 Nov 2021 17:39:07 +0000 (13:39 -0400)]
Merge pull request #21974 from christianwach/lab-core-2909-2

dev/core#2909 - Repair the option value label for nb_NO language

2 years agoRepair the option value label for nb_NO language
Christian Wach [Thu, 4 Nov 2021 15:20:13 +0000 (15:20 +0000)]
Repair the option value label for nb_NO language

2 years agoSet version to 5.45.alpha1
CiviCRM [Thu, 4 Nov 2021 07:53:51 +0000 (07:53 +0000)]
Set version to 5.45.alpha1

2 years agoSet version to 5.44.beta1
CiviCRM [Thu, 4 Nov 2021 07:47:04 +0000 (07:47 +0000)]
Set version to 5.44.beta1

2 years agoMerge pull request #21972 from eileenmcnaughton/gettok
Seamus Lee [Thu, 4 Nov 2021 05:16:52 +0000 (16:16 +1100)]
Merge pull request #21972 from eileenmcnaughton/gettok

Remove call to getTokenDetails

2 years agoMerge pull request #21967 from colemanw/searchRunFix
Eileen McNaughton [Thu, 4 Nov 2021 03:39:13 +0000 (16:39 +1300)]
Merge pull request #21967 from colemanw/searchRunFix

SearchKit - Fix incorrect pager count when using filters

2 years agoMerge pull request #21947 from colemanw/cssRules
Eileen McNaughton [Thu, 4 Nov 2021 03:35:46 +0000 (16:35 +1300)]
Merge pull request #21947 from colemanw/cssRules

SearchKit - Conditional style rules for rows/cells

2 years agoMerge pull request #21957 from eileenmcnaughton/lang
Eileen McNaughton [Thu, 4 Nov 2021 03:32:32 +0000 (16:32 +1300)]
Merge pull request #21957 from eileenmcnaughton/lang

Use null variables rather than isset in Core_Block

2 years agotransitionParticipants() - Improve $contactDetails cache maintenance
Tim Otten [Thu, 4 Nov 2021 03:26:27 +0000 (20:26 -0700)]
transitionParticipants() - Improve $contactDetails cache maintenance

This revises a very recent commit that touches `static $contactDetails` cache.

Imagine you have two calls to `transitionParticipants()` which involve different-but-overlapping sets:

* First invocation involves Alice and Bob
* Second invocation involves Bob and Carol

The first invocation loads Alice and Bob into `$contactDetails`.  The second
invocation identifies Carol as missing. We need to load Carol. Here's the change:

* Before: Carol overwrites Bob in `$contactDetails`. Bob goes missing.
* After: Alice, Bob, and Carol all exist in `$contactDetails`.