civicrm-core.git
3 years agoAPIv4 - Add function to get api class name
Coleman Watts [Mon, 22 Mar 2021 16:01:43 +0000 (12:01 -0400)]
APIv4 - Add function to get api class name

Adding the "Case" entity is a problem because it's a reserved php keyword.
So we need to be able to have entity names that don't match their classname.
This function gives us a way to get api class names without guessing from the entity name.

3 years agoMerge pull request #19856 from colemanw/customFieldLabels
colemanw [Mon, 22 Mar 2021 14:04:38 +0000 (10:04 -0400)]
Merge pull request #19856 from colemanw/customFieldLabels

SearchKit - Include custom group title with custom field label

3 years agoMerge pull request #19864 from eileenmcnaughton/nfc
Eileen McNaughton [Mon, 22 Mar 2021 08:52:26 +0000 (21:52 +1300)]
Merge pull request #19864 from eileenmcnaughton/nfc

[NFC] Minor cleanup on test class

3 years agoMerge pull request #19861 from eileenmcnaughton/mem_tax
Seamus Lee [Mon, 22 Mar 2021 08:18:57 +0000 (19:18 +1100)]
Merge pull request #19861 from eileenmcnaughton/mem_tax

[REF] Simplify a couple of variables

3 years ago[NFC] Minor cleanup on test class
eileen [Mon, 22 Mar 2021 07:20:28 +0000 (20:20 +1300)]
[NFC] Minor cleanup on test class

3 years agoMerge pull request #19603 from JMAConsulting/issue-2226
Eileen McNaughton [Mon, 22 Mar 2021 04:34:32 +0000 (17:34 +1300)]
Merge pull request #19603 from JMAConsulting/issue-2226

core#2226: Scheduled Reminder fails to send if From Name includes comma

3 years agoMerge pull request #18466 from mattwire/scheduledJobFatalErrorHandler
Eileen McNaughton [Mon, 22 Mar 2021 03:32:06 +0000 (16:32 +1300)]
Merge pull request #18466 from mattwire/scheduledJobFatalErrorHandler

Remove fatalErrorHandler from scheduled jobs manager

3 years ago[REF] Simplify a couple of variables
eileen [Mon, 22 Mar 2021 02:41:55 +0000 (15:41 +1300)]
[REF] Simplify a couple of variables

Rather than rely on these being passed around retrieve them with
a consistent function.

Note tax_amount is retrieved one other place but that is fixed in
https://github.com/civicrm/civicrm-core/pull/19757

Line item will be used less once
https://github.com/civicrm/civicrm-core/pull/19801 is merged

3 years agoMerge pull request #19857 from eileenmcnaughton/task1
Seamus Lee [Mon, 22 Mar 2021 01:12:47 +0000 (12:12 +1100)]
Merge pull request #19857 from eileenmcnaughton/task1

[REF] Extract getQueryParams

3 years agoMerge pull request #19859 from civicrm/5.36
Seamus Lee [Mon, 22 Mar 2021 01:09:09 +0000 (12:09 +1100)]
Merge pull request #19859 from civicrm/5.36

5.36

3 years agoMerge pull request #19728 from totten/master-authx-guards
Seamus Lee [Mon, 22 Mar 2021 01:07:36 +0000 (12:07 +1100)]
Merge pull request #19728 from totten/master-authx-guards

(dev/core#2077) AuthX - Allow optional "guards"

3 years agoMerge pull request #19812 from eileenmcnaughton/recur
colemanw [Mon, 22 Mar 2021 00:11:42 +0000 (20:11 -0400)]
Merge pull request #19812 from eileenmcnaughton/recur

[REF] Clarify & simplify is_recur param

3 years agoSearchKit - Include custom group title with custom field label
Coleman Watts [Sun, 21 Mar 2021 22:11:59 +0000 (18:11 -0400)]
SearchKit - Include custom group title with custom field label

This makes it easier to tell custom fields apart in SearchKit when they have similar names to core or other custom fields.

This takes advantage of API4.getFields returning both a "title" and "label" attribute.
This keeps "title" the same while appending group title to "label".

3 years agoMerge pull request #19825 from colemanw/api4BridgeJoinSubquery
colemanw [Sun, 21 Mar 2021 23:39:41 +0000 (19:39 -0400)]
Merge pull request #19825 from colemanw/api4BridgeJoinSubquery

APIv4 - Use subquery to LEFT JOIN via a bridge entity

3 years agoExtract getQueryParams
eileen [Fri, 19 Mar 2021 21:13:56 +0000 (10:13 +1300)]
Extract getQueryParams

3 years agoSearchKit - Add "EXCLUDE" join type, to search for entities that do not have a relati...
Coleman Watts [Sun, 21 Mar 2021 20:32:54 +0000 (16:32 -0400)]
SearchKit - Add "EXCLUDE" join type, to search for entities that do not have a relationship to another entity

3 years agoAPIv4 - Use subquery to LEFT JOIN via a bridge entity
Coleman Watts [Thu, 18 Mar 2021 01:53:31 +0000 (21:53 -0400)]
APIv4 - Use subquery to LEFT JOIN via a bridge entity

Bridge entities are supposed to be transparent in APIv4, but when LEFT joining,
an artifact of the double-join would give extraneous results.

3 years agoAPIv4 - Simplify long function by extracting part of it
Coleman Watts [Wed, 17 Mar 2021 12:41:54 +0000 (08:41 -0400)]
APIv4 - Simplify long function by extracting part of it

3 years agoMerge pull request #19828 from eileenmcnaughton/act_contact_hook
colemanw [Sun, 21 Mar 2021 20:50:36 +0000 (16:50 -0400)]
Merge pull request #19828 from eileenmcnaughton/act_contact_hook

dev/core#2390 Add hook support for Activity Contact

3 years agoMerge pull request #19842 from eileenmcnaughton/task
colemanw [Sun, 21 Mar 2021 20:36:27 +0000 (16:36 -0400)]
Merge pull request #19842 from eileenmcnaughton/task

[unreleased regression] Fix export contribution to share tasktrait

3 years agoMerge pull request #19853 from colemanw/api4ExplorerCssFix
Eileen McNaughton [Sun, 21 Mar 2021 20:35:11 +0000 (09:35 +1300)]
Merge pull request #19853 from colemanw/api4ExplorerCssFix

Api4 Explorer - Prevent long results from breaking layout

3 years agoFix ts to E::ts
eileen [Sun, 21 Mar 2021 20:33:54 +0000 (09:33 +1300)]
Fix ts to E::ts

3 years agoauthx - If 'authx_guards' is set, then enforce them
Tim Otten [Thu, 4 Mar 2021 12:41:34 +0000 (04:41 -0800)]
authx - If 'authx_guards' is set, then enforce them

3 years agoauthx - Declare setting "authx_guards"
Tim Otten [Thu, 4 Mar 2021 10:17:01 +0000 (02:17 -0800)]
authx - Declare setting "authx_guards"

3 years agoMerge pull request #19826 from demeritcowboy/nomulticase
Eileen McNaughton [Sun, 21 Mar 2021 19:56:11 +0000 (08:56 +1300)]
Merge pull request #19826 from demeritcowboy/nomulticase

dev/core#2463 - Remove loop that since at least 5.23 does nothing for single cases and crashes for multiple, and for multiple recipients only uses the last activity id for 5.36+

3 years agoApi4 Explorer - Prevent long results from breaking layout
Coleman Watts [Sun, 21 Mar 2021 19:11:02 +0000 (15:11 -0400)]
Api4 Explorer - Prevent long results from breaking layout

3 years agoMerge pull request #19852 from eileenmcnaughton/nfc_test
Eileen McNaughton [Sat, 20 Mar 2021 06:56:12 +0000 (19:56 +1300)]
Merge pull request #19852 from eileenmcnaughton/nfc_test

[NFC] Minor test cleanup

3 years agoMerge pull request #19851 from demeritcowboy/ids-php74
Seamus Lee [Sat, 20 Mar 2021 05:29:48 +0000 (16:29 +1100)]
Merge pull request #19851 from demeritcowboy/ids-php74

dev/core#2366 - Failing test for php 7.4 and IDS for non-admins

3 years ago[NFC] Minor test cleanup
eileen [Sat, 20 Mar 2021 04:12:05 +0000 (17:12 +1300)]
[NFC] Minor test cleanup

3 years agoMerge pull request #19850 from seamuslee001/mysql8_logging_test_fix
Eileen McNaughton [Sat, 20 Mar 2021 03:11:24 +0000 (16:11 +1300)]
Merge pull request #19850 from seamuslee001/mysql8_logging_test_fix

[NFC] Fix logging schema test to work on MySQL8 as it no longer outpu…

3 years agofailing test for php 7.4 and IDS
demeritcowboy [Sat, 20 Mar 2021 02:58:11 +0000 (22:58 -0400)]
failing test for php 7.4 and IDS

3 years ago[NFC] Fix logging schema test to work on MySQL8 as it no longer outputs a length...
Seamus Lee [Sat, 20 Mar 2021 01:49:08 +0000 (12:49 +1100)]
[NFC] Fix logging schema test to work on MySQL8 as it no longer outputs a length for int columns

3 years agoMerge pull request #19849 from seamuslee001/member_event_form_test_fixes
Seamus Lee [Sat, 20 Mar 2021 00:08:56 +0000 (11:08 +1100)]
Merge pull request #19849 from seamuslee001/member_event_form_test_fixes

[NFC] Fix test failures on PHP 7.4 caused by either NULL being set fo…

3 years agoMerge pull request #19847 from seamuslee001/fix_test_failures_mysql8
Seamus Lee [Fri, 19 Mar 2021 23:27:12 +0000 (10:27 +1100)]
Merge pull request #19847 from seamuslee001/fix_test_failures_mysql8

[NFC] Fix Test failures on MySQL 8 caused by change in output of eith…

3 years agoMerge pull request #19846 from seamuslee001/fix_contribution_page_tests
Seamus Lee [Fri, 19 Mar 2021 23:07:44 +0000 (10:07 +1100)]
Merge pull request #19846 from seamuslee001/fix_contribution_page_tests

[NFC] Fix PHP 7.4 errors on ContributionPage tests

3 years agoMerge pull request #19845 from seamuslee001/fix_membership_type_test
Seamus Lee [Fri, 19 Mar 2021 23:06:06 +0000 (10:06 +1100)]
Merge pull request #19845 from seamuslee001/fix_membership_type_test

[NFC] Fix Membership Type Test error on php7.4

3 years agoMerge pull request #19844 from seamuslee001/php74_membership_api_fix
Seamus Lee [Fri, 19 Mar 2021 22:47:55 +0000 (09:47 +1100)]
Merge pull request #19844 from seamuslee001/php74_membership_api_fix

[REF] Fix APIv3 MembershipJob test failure on php7.4 by only doing ch…

3 years ago[NFC] Fix test failures on PHP 7.4 caused by either NULL being set for the membership...
Seamus Lee [Fri, 19 Mar 2021 22:45:52 +0000 (09:45 +1100)]
[NFC] Fix test failures on PHP 7.4 caused by either NULL being set for the membership_type_id or Payment Processor not being set on the form

3 years ago[NFC] Fix Test failures on MySQL 8 caused by change in output of either create table...
Seamus Lee [Fri, 19 Mar 2021 22:17:14 +0000 (09:17 +1100)]
[NFC] Fix Test failures on MySQL 8 caused by change in output of either create table or Column names in queries

3 years ago[NFC] Fix PHP 7.4 errors on ContributionPage tests
Seamus Lee [Fri, 19 Mar 2021 21:54:54 +0000 (08:54 +1100)]
[NFC] Fix PHP 7.4 errors on ContributionPage tests

3 years ago[NFC] Fix Membership Type Test error on php7.4
Seamus Lee [Fri, 19 Mar 2021 21:37:06 +0000 (08:37 +1100)]
[NFC] Fix Membership Type Test error on php7.4

3 years ago[REF] Fix APIv3 MembershipJob test failure on php7.4 by only doing checking if it...
Seamus Lee [Fri, 19 Mar 2021 21:29:30 +0000 (08:29 +1100)]
[REF] Fix APIv3 MembershipJob test failure on php7.4 by only doing checking  if it is not empty

3 years agoFix export contribution to share tasktrait
eileen [Fri, 19 Mar 2021 20:55:47 +0000 (09:55 +1300)]
Fix export contribution to share tasktrait

3 years agoMerge pull request #19787 from demeritcowboy/cancel-button
colemanw [Fri, 19 Mar 2021 19:07:12 +0000 (15:07 -0400)]
Merge pull request #19787 from demeritcowboy/cancel-button

dev/financial#170 - Cancel button on financial batch export is no longer an input so code needs updating

3 years agoMerge pull request #19839 from tschuettler/core_2466
colemanw [Fri, 19 Mar 2021 17:43:16 +0000 (13:43 -0400)]
Merge pull request #19839 from tschuettler/core_2466

(dev/core#2466) - Drop HTML markup in exports for link custom fields

3 years agoMerge pull request #19834 from eileenmcnaughton/seq
colemanw [Fri, 19 Mar 2021 17:43:00 +0000 (13:43 -0400)]
Merge pull request #19834 from eileenmcnaughton/seq

Code cleanup in bootstrap.php

3 years agoMerge pull request #19835 from eileenmcnaughton/task
colemanw [Fri, 19 Mar 2021 12:18:25 +0000 (08:18 -0400)]
Merge pull request #19835 from eileenmcnaughton/task

[REF] Minor function extraction

3 years agoDrop HTML markup in exports for link custom fields
Thomas Schüttler [Fri, 19 Mar 2021 11:25:34 +0000 (12:25 +0100)]
Drop HTML markup in exports for link custom fields

3 years agoMerge pull request #19838 from eileenmcnaughton/nfc
Seamus Lee [Fri, 19 Mar 2021 08:57:16 +0000 (19:57 +1100)]
Merge pull request #19838 from eileenmcnaughton/nfc

[NFC] Minor coding standards cleanup

3 years agoMerge pull request #19836 from eileenmcnaughton/legacy
Seamus Lee [Fri, 19 Mar 2021 03:52:54 +0000 (14:52 +1100)]
Merge pull request #19836 from eileenmcnaughton/legacy

Remove legacy phpunit param

3 years ago[NFC] Minor coding standards cleanup
eileen [Fri, 19 Mar 2021 02:50:51 +0000 (15:50 +1300)]
[NFC] Minor coding standards cleanup

3 years ago[REF] Minor function extraction
eileen [Fri, 19 Mar 2021 01:32:32 +0000 (14:32 +1300)]
[REF] Minor function extraction

3 years agoMerge pull request #19833 from eileenmcnaughton/test
Seamus Lee [Fri, 19 Mar 2021 02:02:27 +0000 (13:02 +1100)]
Merge pull request #19833 from eileenmcnaughton/test

Remove safe+mode setting

3 years agoRemove legacy phpunit param
eileen [Fri, 19 Mar 2021 02:00:19 +0000 (15:00 +1300)]
Remove legacy phpunit param

3 years agoMerge pull request #19832 from seamuslee001/core_ext_void
Seamus Lee [Fri, 19 Mar 2021 01:48:18 +0000 (12:48 +1100)]
Merge pull request #19832 from seamuslee001/core_ext_void

[NFC] Add in Void statements on varios Core Ext Tests to future support PHP…

3 years agoMerge pull request #19624 from agileware/CIVICRM-1670
Eileen McNaughton [Fri, 19 Mar 2021 01:10:58 +0000 (14:10 +1300)]
Merge pull request #19624 from agileware/CIVICRM-1670

Issue #2384 - Remove text about email receipts for each recurring contribution

3 years agoCode cleanup in bootstrap.php
eileen [Fri, 19 Mar 2021 00:38:13 +0000 (13:38 +1300)]
Code cleanup in bootstrap.php

3 years agoRemove safe+mode setting
eileen [Fri, 19 Mar 2021 00:27:10 +0000 (13:27 +1300)]
Remove safe+mode setting

This is php5.4 compatibility = not needed

3 years agoAdd in Void statements on varios Core Ext Tests to future support PHPUnit8
Seamus Lee [Fri, 19 Mar 2021 00:14:49 +0000 (11:14 +1100)]
Add in Void statements on varios Core Ext Tests to future support PHPUnit8

3 years agoMerge pull request #19831 from colemanw/angularUpgrade
Eileen McNaughton [Thu, 18 Mar 2021 22:07:46 +0000 (11:07 +1300)]
Merge pull request #19831 from colemanw/angularUpgrade

Upgrade angularJs from 1.8.0 to 1.8.2

3 years agoMerge pull request #19753 from eileenmcnaughton/format
Seamus Lee [Thu, 18 Mar 2021 21:48:55 +0000 (08:48 +1100)]
Merge pull request #19753 from eileenmcnaughton/format

dev/core#1494 & dev/translation#65 call brickmoney number formatting, where supported

3 years agoMerge pull request #19830 from kewljuice/patch-6
Eileen McNaughton [Thu, 18 Mar 2021 21:24:42 +0000 (10:24 +1300)]
Merge pull request #19830 from kewljuice/patch-6

Fix deprecated Redis::delete() (issue #2468)

3 years agoUpgrade angularJs from 1.8.0 to 1.8.2
Coleman Watts [Thu, 18 Mar 2021 20:34:05 +0000 (16:34 -0400)]
Upgrade angularJs from 1.8.0 to 1.8.2

3 years agoFix deprecated Redis::delete() (issue #2468)
Wouter H [Thu, 18 Mar 2021 19:45:52 +0000 (20:45 +0100)]
Fix deprecated Redis::delete() (issue #2468)

3 years agoMerge pull request #19827 from civicrm/5.36
Seamus Lee [Thu, 18 Mar 2021 08:33:13 +0000 (19:33 +1100)]
Merge pull request #19827 from civicrm/5.36

5.36

3 years agodev/core#2390 Add hook support for Activity Contact
eileen [Thu, 18 Mar 2021 06:57:05 +0000 (19:57 +1300)]
dev/core#2390 Add hook support for Activity Contact

Alternative to https://github.com/civicrm/civicrm-core/pull/19623
per comments on that PR.

3 years agoAdd release-notes/5.35.1
Tim Otten [Thu, 18 Mar 2021 02:00:27 +0000 (19:00 -0700)]
Add release-notes/5.35.1

3 years ago(security/core#105) Joomla::authenticate() - Fix escaping
Tim Otten [Tue, 16 Feb 2021 21:45:23 +0000 (13:45 -0800)]
(security/core#105) Joomla::authenticate() - Fix escaping

3 years ago(security/core#105) Joomla::checkUserNameEmailExists - Fix mismatched escaping
Tim Otten [Tue, 16 Feb 2021 21:42:52 +0000 (13:42 -0800)]
(security/core#105) Joomla::checkUserNameEmailExists - Fix mismatched escaping

This uses the escaping rule from CRM_Core_DAO to construct a query for JDatabaseDriver.
However, they use different connections and (therefore) could require different
escaping rules.

3 years ago(security/core#104) CRM_Utils_System::authenticateKey - Use secure equality test
Tim Otten [Thu, 25 Feb 2021 01:54:42 +0000 (17:54 -0800)]
(security/core#104) CRM_Utils_System::authenticateKey - Use secure equality test

3 years ago(security/core#97) PHP CLI guard is the opposite of correct
Tim Otten [Thu, 25 Feb 2021 05:01:26 +0000 (21:01 -0800)]
(security/core#97) PHP CLI guard is the opposite of correct

3 years agoEscape api params in APIv4 Explorer
Coleman Watts [Fri, 29 Jan 2021 19:30:38 +0000 (14:30 -0500)]
Escape api params in APIv4 Explorer

3 years agoPurify PCP introductory text field
Seamus Lee [Wed, 23 Dec 2020 09:04:18 +0000 (20:04 +1100)]
Purify PCP introductory text field

3 years agoEscape information supplied by extensions to prevent XSS
Seamus Lee [Wed, 23 Dec 2020 08:45:56 +0000 (19:45 +1100)]
Escape information supplied by extensions to prevent XSS

3 years agosecurity/core#97 Ensure that php scripts where applicable in sql and tools that shoul...
Seamus Lee [Mon, 9 Nov 2020 09:11:24 +0000 (20:11 +1100)]
security/core#97 Ensure that php scripts where applicable in sql and tools that should only be run in CLI can be run in CLI

Use more portable check for cli and add in 404 header as per Rich's comments

3 years agosecurity/core#100 Escape uploaded data to prevent Reflected Cross site scripting...
Seamus Lee [Mon, 16 Nov 2020 08:06:16 +0000 (19:06 +1100)]
security/core#100 Escape uploaded data to prevent Reflected Cross site scripting from uploaded CSVs

3 years agoremove loop that since at least 5.23 does nothing for single cases and crashes for...
demeritcowboy [Thu, 18 Mar 2021 02:49:41 +0000 (22:49 -0400)]
remove loop that since at least 5.23 does nothing for single cases and crashes for multiple, and for multiple recipients only uses the last activity id for 5.36+

3 years agoMerge pull request #19824 from eileenmcnaughton/url_form
Seamus Lee [Wed, 17 Mar 2021 21:50:01 +0000 (08:50 +1100)]
Merge pull request #19824 from eileenmcnaughton/url_form

Remove now-empty function

3 years agoMerge pull request #19765 from colemanw/inPlaceEdit
Eileen McNaughton [Wed, 17 Mar 2021 19:21:44 +0000 (08:21 +1300)]
Merge pull request #19765 from colemanw/inPlaceEdit

SearchKit - Add "in-place edit" feature

3 years agoRemove now-empty function
eileen [Wed, 17 Mar 2021 19:20:50 +0000 (08:20 +1300)]
Remove now-empty function

3 years agoMerge pull request #19823 from tunbola/fix-isfrontpage-wrong-value
Eileen McNaughton [Wed, 17 Mar 2021 19:19:00 +0000 (08:19 +1300)]
Merge pull request #19823 from tunbola/fix-isfrontpage-wrong-value

dev/core#2464: Fix Drupal Base 'isFrontEndPage' Returns Wrong Value After Saving A Settings Page

3 years agodev/core#2464: Rebuild Menu after clearing db cache
Tunbola Ogunwande [Wed, 17 Mar 2021 14:07:59 +0000 (15:07 +0100)]
dev/core#2464: Rebuild Menu after clearing db cache

3 years agoMerge pull request #19766 from WeMoveEU/faster-select2-groups
colemanw [Wed, 17 Mar 2021 01:45:39 +0000 (21:45 -0400)]
Merge pull request #19766 from WeMoveEU/faster-select2-groups

dev/core#2451 Faster processing of optgroups in select2 elements

3 years agoMerge pull request #19816 from eileenmcnaughton/dupe_state
colemanw [Wed, 17 Mar 2021 01:38:45 +0000 (21:38 -0400)]
Merge pull request #19816 from eileenmcnaughton/dupe_state

[NFC] Minor IDE cleanup in test class

3 years agoMerge pull request #19821 from eileenmcnaughton/import
Eileen McNaughton [Tue, 16 Mar 2021 22:07:09 +0000 (11:07 +1300)]
Merge pull request #19821 from eileenmcnaughton/import

Remove an unnecessary ampersand

3 years agoRemove an unnecessary ampersand
eileen [Tue, 16 Mar 2021 20:28:42 +0000 (09:28 +1300)]
Remove an unnecessary ampersand

3 years agoMerge pull request #19794 from MegaphoneJon/core-2459
Eileen McNaughton [Tue, 16 Mar 2021 07:15:26 +0000 (20:15 +1300)]
Merge pull request #19794 from MegaphoneJon/core-2459

dev/core#2459 Fix custom fields changed from multiple-choice data type to Text

3 years agoMerge pull request #19798 from colemanw/api4cleanup
Eileen McNaughton [Tue, 16 Mar 2021 07:10:59 +0000 (20:10 +1300)]
Merge pull request #19798 from colemanw/api4cleanup

APIv4 - Code cleanup & improve links to @see annotations in Explorer

3 years agoSearchKit - add draggable arrows when configuring display columns
Coleman Watts [Tue, 16 Mar 2021 05:25:20 +0000 (01:25 -0400)]
SearchKit - add draggable arrows when configuring display columns

3 years agoSearchKit - Additional link settings for opening in new tab or popup
Coleman Watts [Wed, 10 Mar 2021 20:17:43 +0000 (15:17 -0500)]
SearchKit - Additional link settings for opening in new tab or popup

3 years agoSearchKit - Add "in-place edit" feature
Coleman Watts [Tue, 9 Mar 2021 15:42:31 +0000 (10:42 -0500)]
SearchKit - Add "in-place edit" feature

3 years agoMerge pull request #19813 from eileenmcnaughton/dupe
Eileen McNaughton [Tue, 16 Mar 2021 02:52:00 +0000 (15:52 +1300)]
Merge pull request #19813 from eileenmcnaughton/dupe

[NFC] IDE cleanup on test class

3 years agoMerge pull request #19815 from civicrm/5.36
Eileen McNaughton [Tue, 16 Mar 2021 02:35:22 +0000 (15:35 +1300)]
Merge pull request #19815 from civicrm/5.36

5.36 to master

3 years ago[NFC] IDE cleanup on test class
eileen [Tue, 16 Mar 2021 00:26:01 +0000 (13:26 +1300)]
[NFC] IDE cleanup on test class

3 years ago[NFC] Minor IDE cleanup
eileen [Tue, 16 Mar 2021 01:26:06 +0000 (14:26 +1300)]
[NFC] Minor IDE cleanup

3 years agoMerge pull request #19811 from jmcclelland/reserve-respondents-5.36
Eileen McNaughton [Tue, 16 Mar 2021 00:58:03 +0000 (13:58 +1300)]
Merge pull request #19811 from jmcclelland/reserve-respondents-5.36

avoid error when reserving respondents in a survey.

3 years ago[REF] Clarify & simplify is_recur param
eileen [Mon, 15 Mar 2021 23:02:21 +0000 (12:02 +1300)]
[REF] Clarify & simplify is_recur param

The only time is_recur leaves the function is when it is passed to
the payment processor so this simplifies so it is only set in that
array & otherwise consistently calculated

3 years agoavoid error when reserving respondents in a survey.
Jamie McClelland [Mon, 15 Mar 2021 13:54:03 +0000 (09:54 -0400)]
avoid error when reserving respondents in a survey.

The full error is:

Error: Call to a member function getSelectedIDs() on null in CRM_Campaign_Form_Task->preProcess() (line 38 of /var/www/powerbase/sites/all/modules/civicrm/CRM/Campaign/Form/Task.php).

I'm not sure if we should somehow be passing &$form to this function
instead?

3 years agoMerge pull request #19779 from artfulrobot/artfulrobot-improve-quicksearch
Eileen McNaughton [Mon, 15 Mar 2021 20:45:00 +0000 (09:45 +1300)]
Merge pull request #19779 from artfulrobot/artfulrobot-improve-quicksearch

Improve quicksearch result presentation to enable browser link functions

3 years agoMerge pull request #19803 from eileenmcnaughton/little_bit_super
Eileen McNaughton [Mon, 15 Mar 2021 19:52:26 +0000 (08:52 +1300)]
Merge pull request #19803 from eileenmcnaughton/little_bit_super

[REF] Minor extraction to help cleanup permission code