Eileen McNaughton [Wed, 10 Nov 2021 20:46:11 +0000 (09:46 +1300)]
Ensure contact values are always assigned to the template
colemanw [Fri, 12 Nov 2021 20:11:25 +0000 (15:11 -0500)]
Merge pull request #22056 from eileenmcnaughton/context
Ensure context is always set
Eileen McNaughton [Fri, 12 Nov 2021 20:10:40 +0000 (09:10 +1300)]
Merge pull request #21909 from eileenmcnaughton/greeting_sanity
[REF] Preliminary cleanup in update greeting
colemanw [Fri, 12 Nov 2021 20:10:27 +0000 (15:10 -0500)]
Merge pull request #22055 from eileenmcnaughton/tagg
Ensure contactTag is always set
Eileen McNaughton [Fri, 12 Nov 2021 20:07:20 +0000 (09:07 +1300)]
Merge pull request #22057 from civicrm/5.44
5.44
colemanw [Fri, 12 Nov 2021 19:33:45 +0000 (14:33 -0500)]
Merge pull request #22059 from demeritcowboy/smarty-static-problem
php8 - fix for breadcrumb fails during tests
demeritcowboy [Fri, 12 Nov 2021 14:54:38 +0000 (09:54 -0500)]
temp fix for static smarty during tests
colemanw [Fri, 12 Nov 2021 13:50:23 +0000 (08:50 -0500)]
Merge pull request #22051 from eileenmcnaughton/544
APIv4 - Add backticks around fields in join criteria
Seamus Lee [Fri, 12 Nov 2021 08:49:14 +0000 (19:49 +1100)]
Merge pull request #22044 from eileenmcnaughton/dep
Mark a few more token functions as deprected
Seamus Lee [Fri, 12 Nov 2021 08:26:26 +0000 (19:26 +1100)]
Merge pull request #22046 from totten/5.44-eventid
(dev/core#2947) Tokens - Auto-enable `{event.*}` if `participantId` is present
Eileen McNaughton [Wed, 10 Nov 2021 21:52:40 +0000 (10:52 +1300)]
Ensure context is always set
Eileen McNaughton [Wed, 10 Nov 2021 21:52:17 +0000 (10:52 +1300)]
Ensure contactTag is always set
Seamus Lee [Fri, 12 Nov 2021 06:26:07 +0000 (17:26 +1100)]
Merge pull request #22047 from eileenmcnaughton/isset_gender
Ensure gender_display is always set
Seamus Lee [Fri, 12 Nov 2021 06:16:34 +0000 (17:16 +1100)]
Merge pull request #22053 from civicrm/5.44
5.44
Seamus Lee [Fri, 12 Nov 2021 05:54:49 +0000 (16:54 +1100)]
Merge pull request #22043 from seamuslee001/5.44
[REF] Skip testCutesyTokenData on php8 for the moment
Seamus Lee [Fri, 12 Nov 2021 05:13:52 +0000 (16:13 +1100)]
Merge pull request #22048 from demeritcowboy/session-status
[NFC] php8 - set smarty null defaults for CRM_Core_SessionTest
Coleman Watts [Fri, 12 Nov 2021 02:42:36 +0000 (21:42 -0500)]
APIv4 - Add backticks around fields in join criteria
Fixes dev/mail#103
Tim Otten [Fri, 12 Nov 2021 04:28:12 +0000 (20:28 -0800)]
Merge pull request #21989 from colemanw/managedEntityDelete
ManagedEntities - Track modification and auto-update
Tim Otten [Fri, 12 Nov 2021 04:08:16 +0000 (20:08 -0800)]
Refine alignment of old/new token lists
The prior commit means that `$context['participantId']` will activate `{event.*}` tokens - in contexts
that use `TokenProcessor`. And the `TokenProcessor` is *somewhat* matched to the older functions.
This twiddles the match-up:
* Provide continuity for the deprecated `CRM_Core_SelectValues::participantTokens()` - so it still
only returns `{participant.*}` tokens. Borrow the technique which excludes `{domain.*}` tokens.
This should ensure better continuity for any callers that actually use `CRM_Utils_Token`.
* Update the assertions for the `TokenProcessor` to show that the `{event.*}` tokens are presented in
participant-related contexts.
Tim Otten [Fri, 12 Nov 2021 00:41:30 +0000 (16:41 -0800)]
dev/core#2947 - Auto-enable `{event.*}` if `participantId` is present
Seamus Lee [Thu, 11 Nov 2021 04:26:00 +0000 (04:26 +0000)]
[REF] Fix Pledge Test failing on php8 by ensuring all payments have a status assigned and that customGroup is always assigned to the template and updating test to pass in some additional form values
demeritcowboy [Fri, 12 Nov 2021 02:06:16 +0000 (21:06 -0500)]
php8 - set null defaults
Eileen McNaughton [Wed, 10 Nov 2021 20:46:11 +0000 (09:46 +1300)]
Ensure gender_display is always set
Always add it, rather than checking if it is assiged in the template
Eileen McNaughton [Sat, 23 Oct 2021 00:58:43 +0000 (13:58 +1300)]
[REF] Preliminary cleanup in update greeting
demeritcowboy [Fri, 12 Nov 2021 00:39:04 +0000 (19:39 -0500)]
Merge pull request #22042 from eileenmcnaughton/isset2
Ensure userRecordUrl is always set- fixes enotice with escape-on-output
Seamus Lee [Thu, 11 Nov 2021 23:58:01 +0000 (10:58 +1100)]
[REF] Skip testCutesyTokenData on php8 for the moment
Eileen McNaughton [Thu, 11 Nov 2021 23:46:34 +0000 (12:46 +1300)]
Mark a few more token functions as deprected
These are only used by the legacy mailing code or, in some cases, used by unsubscribe where it should use
the token processor
Eileen McNaughton [Thu, 11 Nov 2021 23:18:47 +0000 (12:18 +1300)]
Merge pull request #22038 from yashodha/report
(dev/core#2951) expose contribution custom fields in lybunt report
Eileen McNaughton [Thu, 11 Nov 2021 23:18:18 +0000 (12:18 +1300)]
Merge pull request #22041 from demeritcowboy/aggregate-report
dev/report#77 - Make contribution filters work for contribute/history civireport
Eileen McNaughton [Wed, 10 Nov 2021 21:50:02 +0000 (10:50 +1300)]
Ensure userRecordUrl is always set
demeritcowboy [Thu, 11 Nov 2021 18:48:00 +0000 (13:48 -0500)]
Merge pull request #22040 from colemanw/expectedKeys
Fix tabs getting overwritten by double foreach loop
demeritcowboy [Thu, 11 Nov 2021 16:43:08 +0000 (11:43 -0500)]
Merge pull request #21936 from JMAConsulting/issue_2912
dev/core#2912 : Can't save extra custom fields when inline and required
demeritcowboy [Thu, 11 Nov 2021 16:18:27 +0000 (11:18 -0500)]
Merge pull request #22031 from eileenmcnaughton/image
Ensure imageUrl is always set
demeritcowboy [Tue, 9 Nov 2021 23:09:08 +0000 (18:09 -0500)]
make contribution filters work
Coleman Watts [Thu, 11 Nov 2021 15:19:34 +0000 (10:19 -0500)]
Fix tabs getting overwritten by double foreach loop
Seamus Lee [Thu, 11 Nov 2021 06:17:46 +0000 (17:17 +1100)]
Merge pull request #22037 from seamuslee001/ref_pledge_test_php8
[REF] Fix Pledge Test failing on php8 by ensuring all payments have a…
yashodha [Thu, 11 Nov 2021 05:22:36 +0000 (10:52 +0530)]
expose contribution custom fields in lybunt report
Seamus Lee [Thu, 11 Nov 2021 04:26:00 +0000 (04:26 +0000)]
[REF] Fix Pledge Test failing on php8 by ensuring all payments have a status assigned and that customGroup is always assigned to the template and updating test to pass in some additional form values
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
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…
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
Eileen McNaughton [Thu, 11 Nov 2021 00:04:58 +0000 (13:04 +1300)]
Escape-on-output-proof enotice fixes
Eileen McNaughton [Wed, 10 Nov 2021 23:59:33 +0000 (12:59 +1300)]
Merge pull request #22019 from colemanw/searchKitLoading
SearchKit - Animated loading skeleton
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
Eileen McNaughton [Wed, 10 Nov 2021 21:49:20 +0000 (10:49 +1300)]
Ensure imageUrl is always set
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
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
Eileen McNaughton [Sun, 31 Oct 2021 21:49:34 +0000 (10:49 +1300)]
Do not smarty encode quicksearch html
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
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
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
Coleman Watts [Sun, 7 Nov 2021 16:54:54 +0000 (11:54 -0500)]
ManagedEntity - Add update mode 'unmodified' and fix cleanup mode 'unused' for APIv4
Update mode 'unmodified' will only update a record if it has not been locally edited.
This new setting works only for entities opted-in to the APIv4 ManagedEntity trait, and will
emit a warning and fall back on 'always' for others.
Cleanup mode 'unmodified' now works for APIv4 managed entities, and they are cleaned up
in reverse order to ensure references are deleted before their parents.
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.
Eileen McNaughton [Wed, 10 Nov 2021 20:18:10 +0000 (09:18 +1300)]
Ensure action is set when loading contactFooter
Eileen McNaughton [Wed, 10 Nov 2021 19:57:46 +0000 (08:57 +1300)]
Remove use of isset for info.tpl
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
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
Eileen McNaughton [Sat, 6 Nov 2021 00:03:30 +0000 (13:03 +1300)]
Enotice fix for footer.tpl
Ensure that contactId is always present
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.
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
Matthew Wire [Wed, 10 Nov 2021 16:51:11 +0000 (16:51 +0000)]
Switch to debug level logging for lock debugging
demeritcowboy [Wed, 10 Nov 2021 16:07:32 +0000 (11:07 -0500)]
smarty warning
demeritcowboy [Wed, 10 Nov 2021 16:00:26 +0000 (11:00 -0500)]
remove useless comment
demeritcowboy [Wed, 10 Nov 2021 15:28:12 +0000 (10:28 -0500)]
assign formTpl
demeritcowboy [Wed, 10 Nov 2021 14:19:19 +0000 (09:19 -0500)]
Merge pull request #22000 from eileenmcnaughton/body
Ensure beginHookFormElements is assigned
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
Coleman Watts [Wed, 10 Nov 2021 13:47:36 +0000 (08:47 -0500)]
APIv4 - Add getRefCount utility & include afforms in SavedSearch refCounts.
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…
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
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.
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
demeritcowboy [Tue, 9 Nov 2021 23:35:03 +0000 (18:35 -0500)]
report seems fine now
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
demeritcowboy [Wed, 10 Nov 2021 02:15:41 +0000 (21:15 -0500)]
Merge pull request #22001 from eileenmcnaughton/hook
Ensure hookContentPlacement is assigned
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
Coleman Watts [Wed, 10 Nov 2021 00:43:34 +0000 (19:43 -0500)]
SearchKit - Animated loading skeleton
demeritcowboy [Wed, 10 Nov 2021 00:16:47 +0000 (19:16 -0500)]
always set formTpl
Brian Shaughnessy [Wed, 10 Nov 2021 00:12:10 +0000 (19:12 -0500)]
dev/core#1529 fix event repeat functionality
demeritcowboy [Tue, 9 Nov 2021 23:41:34 +0000 (18:41 -0500)]
unused variable
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
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
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
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.
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
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
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…
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
Coleman Watts [Mon, 8 Nov 2021 19:03:49 +0000 (14:03 -0500)]
APIv4 Explorer - Optionally view results in PHP format
Jamie McClelland [Mon, 8 Nov 2021 19:19:06 +0000 (14:19 -0500)]
don't overfill the prevnext cache when reserving for a survey.
Rich Lott / Artful Robot [Mon, 8 Nov 2021 14:31:14 +0000 (14:31 +0000)]
Fix unencoded mailing url query param in Mailing report
Tano Rojas [Fri, 5 Nov 2021 09:05:26 +0000 (16:05 +0700)]
Handle activity creation for emails to organization contacts
Seamus Lee [Mon, 8 Nov 2021 04:09:42 +0000 (15:09 +1100)]
Merge pull request #22003 from civicrm/5.44
5.44
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
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
Eileen McNaughton [Sun, 7 Nov 2021 22:55:14 +0000 (11:55 +1300)]
Extract getGroupOrganizationUrl & ensure always assigned
Eileen McNaughton [Sat, 6 Nov 2021 00:07:49 +0000 (13:07 +1300)]
Ensure that keys are set in tabValues before hitting smarty
Eileen McNaughton [Sun, 7 Nov 2021 22:34:14 +0000 (11:34 +1300)]
Ensure hookContentPlacement is assigned
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
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
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