civicrm-core.git
4 years agoFix metadata on member export
eileen [Sun, 28 Jul 2019 15:41:12 +0000 (03:41 +1200)]
Fix metadata on member export

Note auto_renew seems un-exportable so I removed it from return properties

4 years agoMerge pull request #15029 from reecebenson/bugfix/reports-remove-sorting-filters
Eileen McNaughton [Fri, 16 Aug 2019 21:13:05 +0000 (09:13 +1200)]
Merge pull request #15029 from reecebenson/bugfix/reports-remove-sorting-filters

Allow for the deselection of sorting filters

4 years agoFix undefined index when setting value to empty when removing order by filters
Reece Benson [Fri, 16 Aug 2019 06:31:31 +0000 (07:31 +0100)]
Fix undefined index when setting value to empty when removing order by filters

4 years agoMerge pull request #15015 from eileenmcnaughton/import_message
Seamus Lee [Thu, 15 Aug 2019 22:46:51 +0000 (08:46 +1000)]
Merge pull request #15015 from eileenmcnaughton/import_message

[REF] [Import] Minor cleanup on status setting.

4 years agoMerge pull request #15017 from eileenmcnaughton/import_cont
Seamus Lee [Thu, 15 Aug 2019 22:46:07 +0000 (08:46 +1000)]
Merge pull request #15017 from eileenmcnaughton/import_cont

[REF] [Import] extract saved mapping code to parent class

4 years agoMerge pull request #14981 from eileenmcnaughton/load_extract
Seamus Lee [Thu, 15 Aug 2019 22:42:43 +0000 (08:42 +1000)]
Merge pull request #14981 from eileenmcnaughton/load_extract

[Import] [Cleanup] remove unused parameters

4 years agoMerge pull request #15028 from eileenmcnaughton/import_processor
Seamus Lee [Thu, 15 Aug 2019 22:41:27 +0000 (08:41 +1000)]
Merge pull request #15028 from eileenmcnaughton/import_processor

[Test] [Ref] [Import]Add wrapper class for importProcessor

4 years agoMerge pull request #15032 from demeritcowboy/human-label-function
Eileen McNaughton [Thu, 15 Aug 2019 21:27:10 +0000 (09:27 +1200)]
Merge pull request #15032 from demeritcowboy/human-label-function

dev/core#1116 - towards fixing activity type name vs label

4 years agoMerge pull request #15045 from mattwire/detaillogging_viewdelete
Eileen McNaughton [Thu, 15 Aug 2019 21:25:35 +0000 (09:25 +1200)]
Merge pull request #15045 from mattwire/detaillogging_viewdelete

Enable view/revert delete action for detail logging

4 years agoMerge pull request #15035 from scardinius/core-1185
Eileen McNaughton [Thu, 15 Aug 2019 21:24:17 +0000 (09:24 +1200)]
Merge pull request #15035 from scardinius/core-1185

Display only own assignees contact(s) on batch activity form

4 years agoMerge pull request #14992 from sushantpaste/membership-fee-token
Matthew Wire [Thu, 15 Aug 2019 17:17:22 +0000 (18:17 +0100)]
Merge pull request #14992 from sushantpaste/membership-fee-token

Membership fee token fix dev/core/#377

4 years agoEnable view/revert delete action for detail logging
Matthew Wire (MJW Consulting) [Thu, 15 Aug 2019 11:03:25 +0000 (12:03 +0100)]
Enable view/revert delete action for detail logging

4 years agoMerge pull request #15042 from civicrm/5.17
Eileen McNaughton [Thu, 15 Aug 2019 05:41:24 +0000 (17:41 +1200)]
Merge pull request #15042 from civicrm/5.17

5.17

4 years agoMerge pull request #15041 from seamuslee001/5.17
Seamus Lee [Thu, 15 Aug 2019 04:43:04 +0000 (14:43 +1000)]
Merge pull request #15041 from seamuslee001/5.17

Add release-notes/5.16.2.md

4 years agoAdd release-notes/5.16.2.md
Tim Otten [Thu, 15 Aug 2019 03:10:55 +0000 (20:10 -0700)]
Add release-notes/5.16.2.md

4 years agoMerge pull request #15038 from civicrm/5.17
Eileen McNaughton [Wed, 14 Aug 2019 22:30:30 +0000 (10:30 +1200)]
Merge pull request #15038 from civicrm/5.17

5.17 to master

4 years agoMerge pull request #15037 from demeritcowboy/fin-account-limbo
Eileen McNaughton [Wed, 14 Aug 2019 22:29:58 +0000 (10:29 +1200)]
Merge pull request #15037 from demeritcowboy/fin-account-limbo

dev/financial#65 - Revert recent changes that cause financial account edit form to be blank

4 years agodev/financial#65
DemeritCowboy [Wed, 14 Aug 2019 21:07:31 +0000 (17:07 -0400)]
dev/financial#65

4 years agoMerge pull request #15036 from reecebenson/contributor-add
Eileen McNaughton [Wed, 14 Aug 2019 18:58:29 +0000 (06:58 +1200)]
Merge pull request #15036 from reecebenson/contributor-add

Add myself to the contributor list

4 years agomake temporary function towards bigger changes
DemeritCowboy [Wed, 14 Aug 2019 03:38:13 +0000 (23:38 -0400)]
make temporary function towards bigger changes

4 years agoAdd myself to the contributor list
Reece Benson [Wed, 14 Aug 2019 12:55:19 +0000 (13:55 +0100)]
Add myself to the contributor list

4 years agoMerge pull request #15033 from eileenmcnaughton/dumb
Seamus Lee [Wed, 14 Aug 2019 09:01:10 +0000 (19:01 +1000)]
Merge pull request #15033 from eileenmcnaughton/dumb

Remove silly dumb unreachable lines

4 years agodev/core#1185 Display only own assignees contact(s) on batch activity form
scardinius [Wed, 14 Aug 2019 08:56:15 +0000 (10:56 +0200)]
dev/core#1185 Display only own assignees contact(s) on batch activity form

4 years agoRemove silly dumb unreachable lines
eileen [Wed, 14 Aug 2019 06:57:45 +0000 (18:57 +1200)]
Remove silly dumb unreachable lines

4 years agoAdd wrapper class for importProcessor
eileen [Tue, 13 Aug 2019 10:46:49 +0000 (22:46 +1200)]
Add wrapper class for importProcessor

With the export cleanup creating a new sensible class & migrating code to it turned out to be a good approach.

This adds a class that wraps around the Importer Object, taking the mapping_field db format of fields
as a format - this is also where we wound up with the Export - using that format as it is what is saed.

There is a gap as I noted in https://lab.civicrm.org/dev/core/issues/1172 around the schema's adequacy.

That is not such an issue for this - in that we are not dealing with Contribution import and
this is really just exposing the wrapper for the unit tests at this stage - the only change to
'live' code is a little less php v4 support - we have removed a bunch of these from the constructor of the
other objects already with no observed issues

4 years agoMerge pull request #15000 from demeritcowboy/activityName-1116
Eileen McNaughton [Tue, 13 Aug 2019 21:38:09 +0000 (09:38 +1200)]
Merge pull request #15000 from demeritcowboy/activityName-1116

dev/core#1116 - rename local var activityName

4 years agoMerge pull request #15031 from mfb/upgrade-fix
Eileen McNaughton [Tue, 13 Aug 2019 21:37:09 +0000 (09:37 +1200)]
Merge pull request #15031 from mfb/upgrade-fix

Fix upgrade version for #13487

4 years agoFix upgrade version for https://github.com/civicrm/civicrm-core/pull/13487
mark burdett [Tue, 13 Aug 2019 17:25:25 +0000 (10:25 -0700)]
Fix upgrade version for https://github.com/civicrm/civicrm-core/pull/13487

4 years agoMerge pull request #15027 from demeritcowboy/is-nullish
colemanw [Tue, 13 Aug 2019 15:31:28 +0000 (11:31 -0400)]
Merge pull request #15027 from demeritcowboy/is-nullish

[Test] Demonstrate the truthiness of CRM_Utils_System::isNull

4 years agoAllow for the deselection of sorting filters
Reece Benson [Tue, 13 Aug 2019 14:31:28 +0000 (15:31 +0100)]
Allow for the deselection of sorting filters

4 years agoMerge pull request #15012 from seamuslee001/dev_core_752
Eileen McNaughton [Tue, 13 Aug 2019 10:26:02 +0000 (22:26 +1200)]
Merge pull request #15012 from seamuslee001/dev_core_752

dev/core#752 Add cid parameter when loading custom data via backend f…

4 years ago(no commit message)
DemeritCowboy [Thu, 8 Aug 2019 23:01:48 +0000 (19:01 -0400)]

4 years agoMerge pull request #14988 from eileenmcnaughton/sc
Seamus Lee [Tue, 13 Aug 2019 00:13:16 +0000 (10:13 +1000)]
Merge pull request #14988 from eileenmcnaughton/sc

Unit test for custom date parsing

4 years agoMerge pull request #14999 from demeritcowboy/activityTName-1116
Eileen McNaughton [Tue, 13 Aug 2019 00:12:09 +0000 (12:12 +1200)]
Merge pull request #14999 from demeritcowboy/activityTName-1116

dev/core#1116 - just rename local var activityTName

4 years agoMerge pull request #15026 from civicrm/5.17
Eileen McNaughton [Mon, 12 Aug 2019 23:21:43 +0000 (11:21 +1200)]
Merge pull request #15026 from civicrm/5.17

5.17 to master

4 years agoMerge pull request #15025 from seamuslee001/5_16_1_release_notes
Eileen McNaughton [Mon, 12 Aug 2019 23:21:18 +0000 (11:21 +1200)]
Merge pull request #15025 from seamuslee001/5_16_1_release_notes

5.16.1 release notes

4 years agoMerge pull request #15016 from eileenmcnaughton/act_speed
Seamus Lee [Mon, 12 Aug 2019 23:20:58 +0000 (09:20 +1000)]
Merge pull request #15016 from eileenmcnaughton/act_speed

[NFC] [Test] dev/core#1098 Add unit test & code comments relating to the slow activity search

4 years agoUpdate 5.16.1.md
Tim Otten [Mon, 12 Aug 2019 22:55:38 +0000 (15:55 -0700)]
Update 5.16.1.md

4 years agoAdd in release notes for 5.16.1
Seamus Lee [Mon, 12 Aug 2019 22:17:36 +0000 (08:17 +1000)]
Add in release notes for 5.16.1

4 years agoMerge pull request #15024 from civicrm/5.17
Seamus Lee [Mon, 12 Aug 2019 22:51:38 +0000 (08:51 +1000)]
Merge pull request #15024 from civicrm/5.17

5.17

4 years agoMerge pull request #15021 from seamuslee001/5.17
Seamus Lee [Mon, 12 Aug 2019 22:51:13 +0000 (08:51 +1000)]
Merge pull request #15021 from seamuslee001/5.17

core#1182 - revert crm.menubar.js changes

4 years agodemonstrate isNull
DemeritCowboy [Mon, 12 Aug 2019 21:44:57 +0000 (17:44 -0400)]
demonstrate isNull

4 years agocore#1182 - revert crm.menubar.js changes
Jon Goldberg [Mon, 12 Aug 2019 16:38:28 +0000 (12:38 -0400)]
core#1182 - revert crm.menubar.js changes

4 years agoMerge pull request #15005 from colemanw/empty
Eileen McNaughton [Mon, 12 Aug 2019 20:38:28 +0000 (08:38 +1200)]
Merge pull request #15005 from colemanw/empty

Swap CRM_Utils_Array::value for empty() in conditionals

4 years agoMerge pull request #15020 from MegaphoneJon/core-1182-517
colemanw [Mon, 12 Aug 2019 18:12:48 +0000 (14:12 -0400)]
Merge pull request #15020 from MegaphoneJon/core-1182-517

core#1182 - revert crm.menubar.js changes

4 years agoMerge pull request #15019 from MegaphoneJon/core-1182
colemanw [Mon, 12 Aug 2019 18:12:33 +0000 (14:12 -0400)]
Merge pull request #15019 from MegaphoneJon/core-1182

core#1182 - revert crm.menubar.js changes

4 years agocore#1182 - revert crm.menubar.js changes
Jon Goldberg [Mon, 12 Aug 2019 16:38:28 +0000 (12:38 -0400)]
core#1182 - revert crm.menubar.js changes

4 years agocore#1182 - revert crm.menubar.js changes
Jon Goldberg [Mon, 12 Aug 2019 16:38:28 +0000 (12:38 -0400)]
core#1182 - revert crm.menubar.js changes

4 years agoSwap CRM_Utils_Array::value for empty() or isset() in conditionals
Coleman Watts [Fri, 9 Aug 2019 12:31:18 +0000 (08:31 -0400)]
Swap CRM_Utils_Array::value for empty() or isset() in conditionals

4 years ago[REF] [Import] extract saved mapping code to parent class
eileen [Mon, 12 Aug 2019 02:09:28 +0000 (14:09 +1200)]
[REF] [Import] extract saved mapping code to parent class

I will follow up with narrower adds

4 years agoMerge pull request #15013 from eileenmcnaughton/member_import
Eileen McNaughton [Mon, 12 Aug 2019 01:58:56 +0000 (13:58 +1200)]
Merge pull request #15013 from eileenmcnaughton/member_import

[Import] Minor cleanup on membership import

4 years agodev/core#1098 Add unit test & code comments relating to the slow activity search
eileen [Tue, 2 Jul 2019 20:56:46 +0000 (08:56 +1200)]
dev/core#1098 Add unit test & code comments relating to the slow activity search

The issue is the joining in of component filtering - we should fix this but do it correctly....
We probably need to extend the test to reflect contact ACLs first

4 years ago[Import] Minor cleanup on membership import
eileen [Sun, 11 Aug 2019 21:40:30 +0000 (09:40 +1200)]
[Import] Minor cleanup on membership import

We have a nasty construct (perhaps due to php4 limitations) where the code iterates the _mapperKeys
array & sets a class property specifying the key it occupies. We later use this to check it occupies a key.

This could be much more readable by just checking the array at the right time.

Also I removed an unused private property & a require_once to api.php which is always included

4 years agoMinor cleanup on status setting.
eileen [Sun, 11 Aug 2019 22:33:09 +0000 (10:33 +1200)]
Minor cleanup on status setting.

It appears that this complicated handling is because in the past the setStatus did not have the
ability to ensure a given message was set only once - hence it's being set multiple times

4 years agodev/core#752 Add cid paramater when loading custom data via backend forms so that...
Seamus Lee [Sun, 11 Aug 2019 06:28:48 +0000 (16:28 +1000)]
dev/core#752 Add cid paramater when loading custom data via backend forms so that hooks can modifiy based on contact_id being viewed

Add in handling for cid not being set

Fix assign of cid and switch to using javascript if rather than smarty

4 years agoMerge pull request #15010 from eileenmcnaughton/event_inv
Eileen McNaughton [Sat, 10 Aug 2019 22:10:26 +0000 (10:10 +1200)]
Merge pull request #15010 from eileenmcnaughton/event_inv

Event confirm - (very) minor cleanup + test

4 years agoUpdate test to reflect test setup change
eileen [Sat, 10 Aug 2019 03:46:31 +0000 (15:46 +1200)]
Update test to reflect test setup change

4 years agoEvent confirm - minor cleanup + test
eileen [Sat, 10 Aug 2019 02:08:52 +0000 (14:08 +1200)]
Event confirm - minor cleanup + test

I've just started delving into this & have
1) added a test
2) removed an assign that is  ALSO done in the sendMail function - ie participantID - this is tested
3) removed a pass-by-reference that I checked was not required

4 years agoMerge pull request #15008 from civicrm/5.17
Seamus Lee [Sat, 10 Aug 2019 01:05:40 +0000 (11:05 +1000)]
Merge pull request #15008 from civicrm/5.17

5.17

4 years agoMerge pull request #15007 from MegaphoneJon/core-1175-517
Seamus Lee [Fri, 9 Aug 2019 23:36:40 +0000 (09:36 +1000)]
Merge pull request #15007 from MegaphoneJon/core-1175-517

core#1175 - fix custom searches

4 years agocore#1175 - fix custom searches
Jon Goldberg [Fri, 9 Aug 2019 18:43:36 +0000 (14:43 -0400)]
core#1175 - fix custom searches

4 years agojust rename local var activityTName
DemeritCowboy [Thu, 8 Aug 2019 23:01:48 +0000 (19:01 -0400)]
just rename local var activityTName

4 years agoMerge pull request #14995 from mfb/context-fix
Eileen McNaughton [Fri, 9 Aug 2019 10:18:14 +0000 (22:18 +1200)]
Merge pull request #14995 from mfb/context-fix

Error log improvements: Provide priority level

4 years agoMerge pull request #14715 from eileenmcnaughton/cache_sub
Eileen McNaughton [Fri, 9 Aug 2019 06:28:38 +0000 (18:28 +1200)]
Merge pull request #14715 from eileenmcnaughton/cache_sub

Rewrite subTypeInfo to use caching mechanism

4 years agoMerge pull request #14998 from seamuslee001/manual_geo_code_export
Eileen McNaughton [Fri, 9 Aug 2019 06:20:46 +0000 (18:20 +1200)]
Merge pull request #14998 from seamuslee001/manual_geo_code_export

Allow Manual Geo Code flag to be exported

4 years agoAllow Manual Geo Code flag to be exported
Seamus Lee [Thu, 8 Aug 2019 21:59:53 +0000 (07:59 +1000)]
Allow Manual Geo Code flag to be exported

FIx Export tests by altering to include the manual_geo_code field

Update to title case

4 years agoMerge pull request #14955 from eileenmcnaughton/rel_alok_ref
Eileen McNaughton [Fri, 9 Aug 2019 05:08:57 +0000 (17:08 +1200)]
Merge pull request #14955 from eileenmcnaughton/rel_alok_ref

[REF] Extract chunk of code relating to whether to disabled an inherited relationship

4 years agoRewrite subTypeInfo to use caching mechanism
eileen [Wed, 3 Jul 2019 01:20:52 +0000 (13:20 +1200)]
Rewrite subTypeInfo to use caching mechanism

This seems to be getting a lot of cache misses on prod - presumably due to a lack of sub types
so fixing to use 'modern caching';

4 years agoCRM_Core_Error::debug_var() should have a priority arg.
mark burdett [Fri, 9 Aug 2019 01:20:54 +0000 (18:20 -0700)]
CRM_Core_Error::debug_var() should have a priority arg.

4 years agoMerge pull request #14980 from eileenmcnaughton/mem_renew
Seamus Lee [Thu, 8 Aug 2019 22:12:07 +0000 (08:12 +1000)]
Merge pull request #14980 from eileenmcnaughton/mem_renew

[clean up][ export] Remove membership_auto_renew from defaultReturn properties

4 years agoMerge pull request #14997 from civicrm/5.17
Eileen McNaughton [Thu, 8 Aug 2019 21:36:07 +0000 (09:36 +1200)]
Merge pull request #14997 from civicrm/5.17

5.17 to master

4 years agoMerge pull request #14996 from mfb/revert-14222
Eileen McNaughton [Thu, 8 Aug 2019 21:35:31 +0000 (09:35 +1200)]
Merge pull request #14996 from mfb/revert-14222

Revert #14222 on RC branch

4 years agoRevert "CRM_Core_Error::debug_var() should have a level arg; CRM_Core_Error methods...
mark burdett [Thu, 8 Aug 2019 21:28:13 +0000 (14:28 -0700)]
Revert "CRM_Core_Error::debug_var() should have a level arg; CRM_Core_Error methods could use Civi::log() internally; prefix param support for Civi::log()."

Due to regression https://lab.civicrm.org/dev/core/issues/1174

This reverts commit 3ac984a463d71d796096d5c78c4abd2de0d0a27d.

4 years agoMerge pull request #14990 from eileenmcnaughton/free
colemanw [Thu, 8 Aug 2019 12:53:51 +0000 (08:53 -0400)]
Merge pull request #14990 from eileenmcnaughton/free

Remove ?last? instances of ->free() dev/core#562

4 years agoMembership fee token fix dev/core/#377
sushantpaste [Thu, 8 Aug 2019 12:17:18 +0000 (17:47 +0530)]
Membership fee token fix dev/core/#377

4 years agoMerge pull request #14927 from seamuslee001/remove_template_field_mosaico
Eileen McNaughton [Thu, 8 Aug 2019 08:04:18 +0000 (20:04 +1200)]
Merge pull request #14927 from seamuslee001/remove_template_field_mosaico

Remove template field if using Mosaico in non shoreditch mode

4 years agoSet version to 5.18.alpha1
CiviCRM [Thu, 8 Aug 2019 05:20:07 +0000 (05:20 +0000)]
Set version to 5.18.alpha1

4 years agoSet version to 5.17.beta1
CiviCRM [Thu, 8 Aug 2019 05:13:15 +0000 (05:13 +0000)]
Set version to 5.17.beta1

4 years agoMerge pull request #14991 from eileenmcnaughton/enotice_regress
Tim Otten [Thu, 8 Aug 2019 05:09:34 +0000 (22:09 -0700)]
Merge pull request #14991 from eileenmcnaughton/enotice_regress

Further e-notice regression fix

4 years agoRemove template field if using Mosaico in non shoreditch mode
Seamus Lee [Tue, 30 Jul 2019 21:28:19 +0000 (07:28 +1000)]
Remove template field if using Mosaico in non shoreditch mode

Use double equals instead of single equals

4 years agoMerge pull request #14222 from mfb/debug-var
Eileen McNaughton [Thu, 8 Aug 2019 03:22:54 +0000 (15:22 +1200)]
Merge pull request #14222 from mfb/debug-var

Error log improvements: Provide severity level and use Civi::log()

4 years agoMerge pull request #14985 from herbdool/issue-1170
Eileen McNaughton [Thu, 8 Aug 2019 03:15:56 +0000 (15:15 +1200)]
Merge pull request #14985 from herbdool/issue-1170

Issue 1170

4 years agoMerge pull request #14983 from greenpeace-cee/fix-contact-reference-merge
Eileen McNaughton [Thu, 8 Aug 2019 03:13:45 +0000 (15:13 +1200)]
Merge pull request #14983 from greenpeace-cee/fix-contact-reference-merge

dev/core#1109 - Fix merge not updating ContactReference fields

4 years agoAnd this was the pre-existing enotice
eileen [Thu, 8 Aug 2019 03:04:39 +0000 (15:04 +1200)]
And this was the pre-existing enotice

4 years agoFurther e-notice regression fix
eileen [Thu, 8 Aug 2019 02:56:00 +0000 (14:56 +1200)]
Further e-notice regression fix

4 years agoUnit test for custom date parsing
eileen [Thu, 8 Aug 2019 00:50:03 +0000 (12:50 +1200)]
Unit test for custom date parsing

Unit test for https://github.com/civicrm/civicrm-core/pull/14986
along with some code comments in the test about issues I hit doing what I thought was the right fix
- copied here for visibility

    // @todo I feel like we should work towards this actually parsing $params here -
    // & dropping formatting but
    // per https://github.com/civicrm/civicrm-core/pull/14986 for now $formatted is parsing
    // The issue I hit was that when I tried to extend to checking they were correctly imported
    // I was not actually sure what correct behaviour was for what dates were accepted since
    // it seems to ignore the latter in favour of the former - which seems wrong.

4 years agoRemove ?last? instances of ->free() dev/core#562
eileen [Thu, 8 Aug 2019 01:18:47 +0000 (13:18 +1200)]
Remove ?last? instances of ->free() dev/core#562

These are almost the last places where ->free is to be found. The remaining ones are in the dao
and perhaps out of scope / need more careful investigation

4 years agoMerge pull request #14978 from eileenmcnaughton/map_field
Tim Otten [Thu, 8 Aug 2019 00:59:44 +0000 (17:59 -0700)]
Merge pull request #14978 from eileenmcnaughton/map_field

 Fix (unreleased regression) e-notices on import form

4 years agoMerge pull request #14987 from civicrm/5.16
Eileen McNaughton [Thu, 8 Aug 2019 00:49:05 +0000 (12:49 +1200)]
Merge pull request #14987 from civicrm/5.16

5.16 to master

4 years agoMerge pull request #14986 from eileenmcnaughton/luciano
Eileen McNaughton [Thu, 8 Aug 2019 00:40:15 +0000 (12:40 +1200)]
Merge pull request #14986 from eileenmcnaughton/luciano

[REF][Import] add formatted parameter to formatInput

4 years ago[REF][Import] add formatted parameter to formatInput
Luciano Spiegel [Wed, 7 Aug 2019 16:51:03 +0000 (18:51 +0200)]
[REF][Import] add formatted parameter to formatInput

4 years agoMerge pull request #14960 from eileenmcnaughton/event_test
Eileen McNaughton [Wed, 7 Aug 2019 17:49:54 +0000 (05:49 +1200)]
Merge pull request #14960 from eileenmcnaughton/event_test

dev/drupal#72 Ensure front end profile title is used in event confirmation emails

4 years agoRemove membership_auto_renew from defaultReturn properties
eileen [Wed, 7 Aug 2019 08:30:16 +0000 (20:30 +1200)]
Remove membership_auto_renew from defaultReturn properties

This field is in the defaultReturnProperties for the BAO_Query object but it's a pseudofield and as demonstrated in this PR
https://github.com/civicrm/civicrm-core/pull/14956

the ability of the [search selector](https://github.com/civicrm/civicrm-core/pull/14956/files#diff-ce8713d2ed34e1061d2b3304ec3ff6bbR69)
to determine this value is unrelated to it's presence in the Query object (which always returns an empty value as we can
see in the [export test](https://github.com/civicrm/civicrm-core/pull/14956/files#diff-4686601201fee8a8402a894c1b7df226R291)
despite contribution_recur_id being calculated (as we see a few lines earlier)

4 years agoIssue 1170: Fix URL in CRM_Utils_System_Backdrop::getLoginURL
Herb [Wed, 7 Aug 2019 17:40:49 +0000 (13:40 -0400)]
Issue 1170: Fix URL in CRM_Utils_System_Backdrop::getLoginURL

4 years agodev/core#1109 - Fix merge not updating ContactReference fields
Patrick Figel [Wed, 7 Aug 2019 14:38:59 +0000 (16:38 +0200)]
dev/core#1109 - Fix merge not updating ContactReference fields

This fixes an issue that causes ContactReference custom fields pointing
to a duplicated contact that's being merged to not be updated to the
main (surviving) contact.

4 years agoSwitch to helper function
eileen [Wed, 7 Aug 2019 07:20:22 +0000 (19:20 +1200)]
Switch to helper function

4 years ago[Import] [Cleanup] remove unused paramters
eileen [Wed, 7 Aug 2019 08:46:12 +0000 (20:46 +1200)]
[Import] [Cleanup] remove unused paramters

Looks like some copy & past put these vars here as they are never set & not exposed for
contribution imporrt

4 years agoMerge pull request #14979 from eileenmcnaughton/map_field_zip
Eileen McNaughton [Wed, 7 Aug 2019 07:22:58 +0000 (19:22 +1200)]
Merge pull request #14979 from eileenmcnaughton/map_field_zip

[REF] [Import] extract function that sets field metadata

4 years agodev/core#224 Ensure front end profile title is used in confirmation emails
eileen [Sun, 4 Aug 2019 23:04:22 +0000 (11:04 +1200)]
dev/core#224 Ensure front end profile title is used in confirmation emails

4 years agoExtract loadMessageParams for events
eileen [Sun, 4 Aug 2019 23:02:50 +0000 (11:02 +1200)]
Extract loadMessageParams for events