Eileen McNaughton [Thu, 23 Feb 2023 23:23:08 +0000 (12:23 +1300)]
Merge pull request #25650 from reflexive-communications/event-registration-activity-target
Event registration activity target
Eileen McNaughton [Thu, 23 Feb 2023 22:57:09 +0000 (11:57 +1300)]
Merge pull request #25652 from eileenmcnaughton/body
Php8.x compatibility - do not try to count NULL
Eileen McNaughton [Thu, 23 Feb 2023 22:07:54 +0000 (11:07 +1300)]
Merge pull request #25651 from totten/mbtruncate
Smarty - Fix warnings about 'mb_truncate' modifier
Eileen McNaughton [Thu, 23 Feb 2023 21:50:14 +0000 (10:50 +1300)]
Php8.x compatibility - do not try to count NULL
Eileen McNaughton [Thu, 23 Feb 2023 21:16:10 +0000 (10:16 +1300)]
Merge pull request #25649 from demeritcowboy/case-search
dev/core#4126 - Fix force-url parameters on case dashboard
Tim Otten [Thu, 23 Feb 2023 21:11:52 +0000 (13:11 -0800)]
mb_truncate - Save 0.00000001s
If it's null, then we don't really have to call `$strlen()` or evaluate the `>` operation.
Tim Otten [Thu, 23 Feb 2023 20:43:30 +0000 (12:43 -0800)]
Smarty - Fix warnings about 'mb_truncate' modifier
Steps to reproduce
------------------
* Use PHP 8.1 and D7 with a default logging policy (eg "All Messages" or "Errors and Warnings")
* Use "Search > Find Contacts"
* On the listing page, observe a bunch of warnings
Before
------
~25 warnings, including ~10 related to modifier.mb_truncate.php
After
-----
~10 warnings, none involving `mb_truncate`
Sandor Semsey [Thu, 23 Feb 2023 14:12:22 +0000 (15:12 +0100)]
CRM_Activity_BAO_Activity::addActivity() remove duplicate target_contact_id
Sandor Semsey [Thu, 23 Feb 2023 12:48:08 +0000 (13:48 +0100)]
pass participant contact_id as target_contact_id when creating event registration activity
demeritcowboy [Thu, 23 Feb 2023 15:06:15 +0000 (10:06 -0500)]
fix force-url parameters
Eileen McNaughton [Thu, 23 Feb 2023 04:17:27 +0000 (17:17 +1300)]
Merge pull request #23782 from totten/master-finperm
Allow (some) permissions with colons
Seamus Lee [Thu, 23 Feb 2023 03:34:01 +0000 (14:34 +1100)]
Merge pull request #25248 from eileenmcnaughton/add_template
Update Smarty addTemplateDir function signature to future smarty
Eileen McNaughton [Thu, 23 Feb 2023 01:46:34 +0000 (14:46 +1300)]
Merge pull request #25629 from yashodha/dev-4106
(dev/core#4106) Add filter on pledge payment in contribution report t…
Eileen McNaughton [Thu, 23 Feb 2023 01:31:34 +0000 (14:31 +1300)]
Merge pull request #25648 from eileenmcnaughton/cheaper_failure
Reduce processing load in test `assertAPIFailure`
Tim Otten [Thu, 23 Feb 2023 01:13:39 +0000 (17:13 -0800)]
Merge pull request #25641 from eileenmcnaughton/token_name
Deprecate unused, exception class with non-standard name-spacing
Eileen McNaughton [Thu, 23 Feb 2023 01:07:23 +0000 (14:07 +1300)]
Merge pull request #24746 from mattwire/joblogsearch
Make job ID accessible to searchkit for joblog
Eileen McNaughton [Thu, 23 Feb 2023 00:52:10 +0000 (13:52 +1300)]
Reduce processing load in test assertAPIFailure
In trying to figure out why adding 'too much' (an exception) to the
return caused a memory out I realised that the print_r here is
realised regardless of whether it is needed. This fixes to only
resolve if it is going to be displayed. Arguably this would have
been a case where an inline function would have made sense - but
at the cost of readability - ie it's more helpful
to add code comments to explain the if than to make the codd hard to
follow. The only downside is the hypothetical
possibility of is_error being something other than 1,'1',TRUE - I
think if we thought that was a remote possibilty we would add
a unit test to add it - not cover it in an assertion
demeritcowboy [Thu, 23 Feb 2023 00:40:30 +0000 (19:40 -0500)]
Merge pull request #25587 from herbdool/core-4127-7b
dev/core#4127 move Drupal stuff in getCiviSourceStorage to Drupal use…
Matthew Wire [Fri, 14 Oct 2022 13:33:39 +0000 (14:33 +0100)]
Make job ID accessible to searchkit for joblog
demeritcowboy [Wed, 22 Feb 2023 03:36:11 +0000 (22:36 -0500)]
Merge pull request #25642 from eileenmcnaughton/uffield
Fix add version for civicrm_custom_field.fk_entity
Eileen McNaughton [Wed, 22 Feb 2023 01:38:15 +0000 (14:38 +1300)]
Fix add version for civicrm_custom_field.fk_entity
Per https://github.com/civicrm/civicrm-core/pull/25638#issuecomment-
1439256431
Eileen McNaughton [Tue, 21 Feb 2023 03:36:02 +0000 (16:36 +1300)]
Deprecate unused, exception class with non-standard name-spacing
Eileen McNaughton [Wed, 22 Feb 2023 01:10:29 +0000 (14:10 +1300)]
Merge pull request #25600 from eileenmcnaughton/import_sql
Fix handling of invalid sql query during import
Eileen McNaughton [Wed, 22 Feb 2023 01:08:48 +0000 (14:08 +1300)]
Merge pull request #25640 from civicrm/5.59
5.59 to master
Eileen McNaughton [Wed, 22 Feb 2023 01:06:07 +0000 (14:06 +1300)]
Merge pull request #25638 from eileenmcnaughton/upgrade_fix
Fix master-only regression - upgrade script is in wrong version
Tim Otten [Wed, 22 Feb 2023 00:29:23 +0000 (16:29 -0800)]
Merge pull request #25633 from eileenmcnaughton/559
PEAR Exception handling - Mitigation of scenario where an import table has been deleted and the metadata is out of date
demeritcowboy [Wed, 22 Feb 2023 00:11:06 +0000 (19:11 -0500)]
Merge pull request #25573 from herbdool/core-4127-3
dev/core#4127 move is_drupal to use userSystem logger
Tim Otten [Mon, 13 Jun 2022 23:45:35 +0000 (16:45 -0700)]
parsePrefix() - Don't confuse financialacls dynamic-permissions with permission-prefixes
Eileen McNaughton [Tue, 21 Feb 2023 23:55:05 +0000 (12:55 +1300)]
Fix master-only regression
I merged https://github.com/civicrm/civicrm-core/pull/25471 yesterday,
well after 5.60 branch forked, into master. However, it
includes upgrade script targetting 5.59 - which means that
for anyone already on 5.59 it doesn't run. This moves
it to the correct branch (5.60 aka master)
Eileen McNaughton [Tue, 21 Feb 2023 00:35:42 +0000 (13:35 +1300)]
Fix fatal on datasource error
Seamus Lee [Tue, 21 Feb 2023 23:21:10 +0000 (10:21 +1100)]
Merge pull request #25637 from civicrm/5.59
5.59
Matthew Wire [Tue, 21 Feb 2023 22:20:25 +0000 (22:20 +0000)]
Merge pull request #25602 from eileenmcnaughton/import_set_path
Add 'SavePoint' to import to statusBounce back to
colemanw [Tue, 21 Feb 2023 22:17:06 +0000 (17:17 -0500)]
Merge pull request #25549 from eileenmcnaughton/no_post
Fix custom field bug on UFMatch sync
colemanw [Tue, 21 Feb 2023 22:12:14 +0000 (17:12 -0500)]
Merge pull request #25457 from eileenmcnaughton/notice_cont_view
Move form specific code to the form
colemanw [Tue, 21 Feb 2023 22:11:12 +0000 (17:11 -0500)]
Merge pull request #25522 from eileenmcnaughton/dedupe
Make dedupe exceptions searchable in SearchKit
colemanw [Tue, 21 Feb 2023 22:09:28 +0000 (17:09 -0500)]
Merge pull request #25612 from eileenmcnaughton/ical_notice
E-notice fix Ical display
Herb v/d Dool [Tue, 14 Feb 2023 21:46:37 +0000 (16:46 -0500)]
dev/core#4127 move is_drupal to use userSystem logger
Tim Otten [Tue, 21 Feb 2023 07:09:26 +0000 (23:09 -0800)]
Merge pull request #25392 from eileenmcnaughton/prev_next_divide
dev/core#4112 Privatise `prevNextCache` functions
Tim Otten [Tue, 21 Feb 2023 06:58:34 +0000 (22:58 -0800)]
Merge pull request #25446 from lemniscus/oauth-reduce-dns-queries
Reduce unneeded DNS queries during OAuth flow
Eileen McNaughton [Tue, 21 Feb 2023 06:38:39 +0000 (19:38 +1300)]
Merge pull request #25631 from eileenmcnaughton/poly
composer require --dev yoast/phpunit-polyfills
Tim Otten [Tue, 21 Feb 2023 05:08:30 +0000 (21:08 -0800)]
Merge pull request #25511 from eileenmcnaughton/dep_token6
Extra deprecation for clarity on token function `convertPseudoConstantsUsingMetadata`
Eileen McNaughton [Tue, 21 Feb 2023 04:26:32 +0000 (17:26 +1300)]
Merge pull request #25598 from colemanw/PledgeAutocomplete
Add APIv4 Pledge Autocomplete
Tim Otten [Tue, 21 Feb 2023 04:07:16 +0000 (20:07 -0800)]
Merge pull request #25630 from colemanw/phpQueryEncodeBug
Angular Coder: Fix unescaping of quotes breaking attributes
Seamus Lee [Tue, 21 Feb 2023 02:50:31 +0000 (13:50 +1100)]
Merge pull request #25632 from colemanw/formatCustomValue
EntityRef - Format custom field display value on QuickForms
Coleman Watts [Mon, 20 Feb 2023 23:14:38 +0000 (18:14 -0500)]
EntityRef - Format custom field display value on QuickForms
Eileen [Mon, 20 Feb 2023 23:04:23 +0000 (23:04 +0000)]
Mitigation of scenario where an import table has been deleted and the metadata is out of date
Coleman Watts [Mon, 20 Feb 2023 18:38:09 +0000 (13:38 -0500)]
Angular Coder: Fix unescaping of quotes breaking attributes
Fixes the bug described in https://github.com/civicrm/civicrm-core/pull/25471#issuecomment-
1423233785
Eileen McNaughton [Mon, 20 Feb 2023 21:29:39 +0000 (10:29 +1300)]
Merge pull request #25471 from colemanw/entityReferenceField
Add new EntityReference custom field type
Eileen [Mon, 20 Feb 2023 21:14:29 +0000 (21:14 +0000)]
composer require --dev yoast/phpunit-polyfills
demeritcowboy [Mon, 20 Feb 2023 18:28:47 +0000 (13:28 -0500)]
Merge pull request #25441 from MegaphoneJon/status-is-a-string
getStatus() should be returning a string
Jon Goldberg [Thu, 26 Jan 2023 18:18:57 +0000 (13:18 -0500)]
getStatus() should be returning a string
Coleman Watts [Sat, 21 Jan 2023 20:42:36 +0000 (15:42 -0500)]
CustomFields - Add EntityReference field type based on APIv4 autocomplete
demeritcowboy [Mon, 20 Feb 2023 14:33:20 +0000 (09:33 -0500)]
Merge pull request #25444 from michaelmcandrew/dev/core#4100
Add setting to disable Smarty in scheduled reminders
yashodha [Mon, 20 Feb 2023 09:51:54 +0000 (15:21 +0530)]
(dev/core#4106) Add filter on pledge payment in contribution report templates
Yashodha Chaku [Mon, 20 Feb 2023 05:21:01 +0000 (10:51 +0530)]
Merge pull request #25616 from jitendrapurohit/parse_address_fix
Regression: Fix DB syntax error on Parse address scheduled job
colemanw [Mon, 20 Feb 2023 02:17:54 +0000 (21:17 -0500)]
Merge pull request #25620 from mattwire/afformrelationship
Afform: Fix broken syntax for saving reciprocal relationships
colemanw [Mon, 20 Feb 2023 02:02:38 +0000 (21:02 -0500)]
Merge pull request #25596 from ixiam/devSK-ShowMoreButtonsAlways
Always show "add more buttons" dropdown in searchkit view
Tim Otten [Sun, 19 Feb 2023 22:29:12 +0000 (14:29 -0800)]
Merge pull request #25622 from braders/unnecessary-entity-property
[REF][PHP8.2] Remove unnecessary dynamic property
Seamus Lee [Sun, 19 Feb 2023 20:40:32 +0000 (07:40 +1100)]
Merge pull request #25625 from braders/deprecated-self-callables
[REF][PHP8.2] Fix use of self in callables deprecation
Seamus Lee [Sun, 19 Feb 2023 20:39:51 +0000 (07:39 +1100)]
Merge pull request #25626 from braders/groupcontacttest
[REF][PHP8.2] Tidy up properties on api_v3_GroupContactTest
Seamus Lee [Sun, 19 Feb 2023 20:38:57 +0000 (07:38 +1100)]
Merge pull request #25623 from braders/event-permissions-test
[REF][PHP8.2] Tidy up properties in CRM_Event_BAO_EventPermissionsTest
Seamus Lee [Sun, 19 Feb 2023 20:37:11 +0000 (07:37 +1100)]
Merge pull request #25624 from braders/remove_dedupeRuleGroupID
(REF) Remove test reference to property which no longer exists
Matthew Wire [Sat, 18 Feb 2023 23:17:45 +0000 (23:17 +0000)]
Afform: Fix syntax for saving reciprocal relationships
Bradley Taylor [Sun, 19 Feb 2023 11:14:22 +0000 (11:14 +0000)]
[REF][PHP8.2] Tidy up properties on api_v3_GroupContactTest
Bradley Taylor [Sun, 19 Feb 2023 11:00:23 +0000 (11:00 +0000)]
[REF][PHP8.2] Fix use of self in callables deprecation
Bradley Taylor [Sun, 19 Feb 2023 10:42:15 +0000 (10:42 +0000)]
(REF) Remove test reference to property which no longer exists
Bradley Taylor [Sun, 19 Feb 2023 10:24:42 +0000 (10:24 +0000)]
[REF][PHP8.2] Tidy up properties in CRM_Event_BAO_EventPermissionsTest
Bradley Taylor [Sun, 19 Feb 2023 10:17:21 +0000 (10:17 +0000)]
[REF][PHP8.2] Remove unnecessary dynamic property
Eileen McNaughton [Sun, 19 Feb 2023 04:15:27 +0000 (17:15 +1300)]
Merge pull request #25619 from eileenmcnaughton/php82_test
Php8.2 test fix, remove one instance of undeclared property
Eileen McNaughton [Sat, 18 Feb 2023 23:17:49 +0000 (12:17 +1300)]
Php8.2 test fix, remove one instance on undeclared parameter
Matthew Wire [Sat, 18 Feb 2023 23:42:00 +0000 (23:42 +0000)]
Merge pull request #25617 from eileenmcnaughton/matt_dep
Stop loading unused `relatedObjects`
demeritcowboy [Sat, 18 Feb 2023 23:13:44 +0000 (18:13 -0500)]
Merge pull request #25610 from eileenmcnaughton/doc_block
[NFC] doc block fix
Eileen McNaughton [Sat, 18 Feb 2023 22:08:23 +0000 (11:08 +1300)]
Unset ids for clarity
Eileen McNaughton [Sat, 18 Feb 2023 22:03:53 +0000 (11:03 +1300)]
Stop loaded unused relatedObjects
Eileen McNaughton [Sat, 18 Feb 2023 00:50:11 +0000 (13:50 +1300)]
[NFC] doc block fix
demeritcowboy [Sat, 18 Feb 2023 14:39:16 +0000 (09:39 -0500)]
Merge pull request #25586 from herbdool/core-4127-6
dev/core#4127 move mailing workflow check to userSystem
Matthew Wire [Sat, 18 Feb 2023 09:51:32 +0000 (09:51 +0000)]
Merge pull request #25615 from eileenmcnaughton/matt_dep
Remove function deprecated a year ago
jitendrapurohit [Sat, 18 Feb 2023 06:13:59 +0000 (11:43 +0530)]
Fix DB syntax error on Parse address sched job
Eileen McNaughton [Sat, 18 Feb 2023 06:04:06 +0000 (19:04 +1300)]
Remove function deprecated a year ago
Eileen McNaughton [Sat, 18 Feb 2023 03:30:00 +0000 (16:30 +1300)]
E-notice fix Ical display
Eileen McNaughton [Sat, 18 Feb 2023 00:54:44 +0000 (13:54 +1300)]
Merge pull request #25608 from eileenmcnaughton/test_fix
Fix test to test the thing it was written to test
Eileen McNaughton [Sat, 18 Feb 2023 00:54:23 +0000 (13:54 +1300)]
Merge pull request #25607 from eileenmcnaughton/prop
[NFC] php8.2 support in test class `ActivitySearchTest`
Tim Otten [Sat, 18 Feb 2023 00:05:41 +0000 (16:05 -0800)]
Merge pull request #25599 from totten/5.59-patchset-wp
distmaker - Fix export of WordPress patches
Eileen McNaughton [Fri, 17 Feb 2023 23:41:40 +0000 (12:41 +1300)]
Fix test to test the thing it was written to test
Per https://github.com/civicrm/civicrm-core/pull/23929 the point of the test was
to check that any override coming from parameters or the recurring contribution
record would be respected.
Also see
https://issues.civicrm.org/jira/browse/CRM-16397
However, the test did not explicity change the recurring contribution record amount
field, having been written after a hook was added that was changing the recurring amount
based on the received payment. So it was not testing it's goal - that where they differed
then, for single line item contributions, the recurring record took precedence.
This fixes to specifically alter them to be different, thus testing the override works
and does not rely on the hook (which is likely to change it's behaviour)
Tim Otten [Fri, 17 Feb 2023 23:33:31 +0000 (15:33 -0800)]
Merge pull request #25604 from eileenmcnaughton/parse_private
Make private function private
Eileen McNaughton [Fri, 17 Feb 2023 23:10:06 +0000 (12:10 +1300)]
php8.2 support in test class ActivitySearchTest
Eileen McNaughton [Fri, 17 Feb 2023 22:42:16 +0000 (11:42 +1300)]
Merge pull request #25550 from totten/master-abbr2
Disambiguate `Address.state_province_id:abbr`
Eileen McNaughton [Fri, 17 Feb 2023 21:56:35 +0000 (10:56 +1300)]
Make private function private
Yashodha Chaku [Fri, 17 Feb 2023 10:41:25 +0000 (16:11 +0530)]
Merge pull request #25570 from kurund/profile-api-fixes
update entity mapping logic for profile fields to include contact subtypes
Tim Otten [Fri, 17 Feb 2023 07:59:22 +0000 (23:59 -0800)]
Merge pull request #25445 from lemniscus/oauth-allow-client-to-set-redirect-uri
Allow OAuth redirect URI to be overridden in client or provider config
Eileen McNaughton [Fri, 17 Feb 2023 07:53:17 +0000 (20:53 +1300)]
Merge pull request #25322 from braders/unused-params-contribution-soft-test
(REF) Tidy up unused params in api_v3_ContributionSoftTest
Tim Otten [Fri, 10 Feb 2023 22:40:55 +0000 (14:40 -0800)]
Disambiguate `Address.state_province_id:abbr` (MySQL; simpler version)
Consider `ContactJoinTest::testCreateWithPrimaryAndBilling` which writes the value:
'address_billing.state_province_id:abbr' => 'AK',
The symbol 'AK' can map to three places: Akwa Ibom (Nigeria), Atakora
(Benin), and Alaska (USA). This is an ambiguous choice. It should be
resolved in a consistent way.
One flavor of ambiguity comes from MySQL. When loading abbreviations, Civi
queries with `ORDER BY abbreviation`. This is a *typically* stable, but it
has no *guaranteed* resolution. Adding a secondary sort key makes the
outcome clear/unambiguous.
Tim Otten [Fri, 17 Feb 2023 06:44:19 +0000 (22:44 -0800)]
Merge pull request #25595 from totten/master-api4-cast
APIv4 - Limited support for casting
Tim Otten [Fri, 17 Feb 2023 06:43:04 +0000 (22:43 -0800)]
Merge pull request #25601 from eileenmcnaughton/import_constants
Remove unused constants left over from import cleanup
Tim Otten [Fri, 17 Feb 2023 03:57:30 +0000 (19:57 -0800)]
Merge pull request #25589 from lemniscus/api4-explorer-cv-syntax-short-boolean
api4 explorer: make boolean params work in cv (short syntax)
Tim Otten [Fri, 17 Feb 2023 00:43:46 +0000 (16:43 -0800)]
castTypeSoftly() - Support magic floats and magic ints
Eileen McNaughton [Fri, 17 Feb 2023 02:56:20 +0000 (15:56 +1300)]
Merge pull request #25552 from totten/master-abbr-php
Disambiguate `Address.state_province_id:abbr` (PHP asort)
Eileen McNaughton [Fri, 10 Feb 2023 04:49:06 +0000 (17:49 +1300)]
Use provided params not POST
Eileen McNaughton [Fri, 17 Feb 2023 02:17:00 +0000 (15:17 +1300)]
Add 'SavePoint' to import to statusBounce back to
Eileen McNaughton [Fri, 17 Feb 2023 02:09:27 +0000 (15:09 +1300)]
Remove unused constants left over from import cleanup