civicrm-core.git
5 years agoMerge pull request #14272 from artfulrobot/artfulrobot-gitlab-issue-973
Eileen McNaughton [Thu, 23 May 2019 23:50:48 +0000 (11:50 +1200)]
Merge pull request #14272 from artfulrobot/artfulrobot-gitlab-issue-973

Fix legacy IPN endpoint for Drupal (gitlab issue 973)

5 years agoMerge pull request #14279 from eileenmcnaughton/db_test2
Seamus Lee [Thu, 23 May 2019 23:14:26 +0000 (09:14 +1000)]
Merge pull request #14279 from eileenmcnaughton/db_test2

dev/core#980 [test-dbunit]  Cleanup profile test to not use discontinuted dbunit

5 years agoMerge pull request #14302 from mlutfy/drupal19
Eileen McNaughton [Thu, 23 May 2019 23:12:16 +0000 (11:12 +1200)]
Merge pull request #14302 from mlutfy/drupal19

dev/drupal#19 Drupal8: fix bootstrap when used by the REST API

5 years agoMerge pull request #14313 from AlainBenbassat/issue-981
Eileen McNaughton [Thu, 23 May 2019 23:09:17 +0000 (11:09 +1200)]
Merge pull request #14313 from AlainBenbassat/issue-981

dev/core#981 Sorting participants ignored search values.

5 years agoMerge pull request #14309 from pradpnayak/FinancialItem
Eileen McNaughton [Thu, 23 May 2019 23:00:59 +0000 (11:00 +1200)]
Merge pull request #14309 from pradpnayak/FinancialItem

dev/financial#56 Fix inappropriate sales tax row addition

5 years agoMerge pull request #14312 from spalmstr/Joomla_11
Eileen McNaughton [Thu, 23 May 2019 22:57:16 +0000 (10:57 +1200)]
Merge pull request #14312 from spalmstr/Joomla_11

dev/joomla#11 Fix php warning when viewing profiles

5 years agoMerge pull request #14307 from seamuslee001/dao_style
Seamus Lee [Thu, 23 May 2019 21:30:51 +0000 (07:30 +1000)]
Merge pull request #14307 from seamuslee001/dao_style

NFC Fix DAO Style issues

5 years agocorrects test on empty formvalues in postProcess
Alain Benbassat [Thu, 23 May 2019 20:55:53 +0000 (22:55 +0200)]
corrects test on empty formvalues in postProcess

5 years agoMerge pull request #2 from civicrm/master
AlainBenbassat [Thu, 23 May 2019 20:52:38 +0000 (22:52 +0200)]
Merge pull request #2 from civicrm/master

getting newest code

5 years agoMerge pull request #14308 from eileenmcnaughton/uffield
Seamus Lee [Thu, 23 May 2019 20:14:58 +0000 (06:14 +1000)]
Merge pull request #14308 from eileenmcnaughton/uffield

[NFC] reformat UFFieldTest

5 years agoMerge pull request #14311 from colemanw/public
Eileen McNaughton [Thu, 23 May 2019 20:03:41 +0000 (08:03 +1200)]
Merge pull request #14311 from colemanw/public

Make apiRequst nextId accessible for api4 constructor

5 years agoMerge pull request #14211 from colemanw/routeBinder
colemanw [Thu, 23 May 2019 19:36:41 +0000 (15:36 -0400)]
Merge pull request #14211 from colemanw/routeBinder

crmRouteBinder - Remove params from url if they equal their defaults

5 years agoJoomla_11 Patch CRM/Contact/BAO/Contact/Utils.php
spalmstr [Thu, 23 May 2019 15:56:35 +0000 (16:56 +0100)]
Joomla_11 Patch CRM/Contact/BAO/Contact/Utils.php

5 years agoMake apiRequst nextId accessible for api4 constructor
Coleman Watts [Thu, 23 May 2019 12:52:22 +0000 (08:52 -0400)]
Make apiRequst nextId accessible for api4 constructor

5 years agoMerge pull request #14303 from eileenmcnaughton/extract_cache
Matthew Wire [Thu, 23 May 2019 09:44:15 +0000 (10:44 +0100)]
Merge pull request #14303 from eileenmcnaughton/extract_cache

[REF] extract buildGroupTree function

5 years agoMerge pull request #14301 from eileenmcnaughton/reltest
Matthew Wire [Thu, 23 May 2019 09:37:14 +0000 (10:37 +0100)]
Merge pull request #14301 from eileenmcnaughton/reltest

[REF] Test class cleanup - Extract function to create nuanced custom fields to a trait

5 years agoAdded unit test
Pradeep Nayak [Wed, 22 May 2019 23:53:33 +0000 (00:53 +0100)]
Added unit test

removed space

5 years agoMerge pull request #14102 from jitendrapurohit/core-888
Eileen McNaughton [Thu, 23 May 2019 07:37:31 +0000 (19:37 +1200)]
Merge pull request #14102 from jitendrapurohit/core-888

dev/core#888 - Backoffice participant transfer form does not populate…

5 years agoNFC Fix DAO Style issues
Seamus Lee [Thu, 23 May 2019 01:47:43 +0000 (11:47 +1000)]
NFC Fix DAO Style issues

Remove excess whitespace with Coleman's regex replace

Remove unneeded whitespace

5 years agoMerge pull request #14306 from eileenmcnaughton/doc_block
Eileen McNaughton [Thu, 23 May 2019 03:18:24 +0000 (15:18 +1200)]
Merge pull request #14306 from eileenmcnaughton/doc_block

[NFC] fix comment blocks capitalising null

5 years agoMerge pull request #14305 from eileenmcnaughton/bool
Eileen McNaughton [Thu, 23 May 2019 02:29:59 +0000 (14:29 +1200)]
Merge pull request #14305 from eileenmcnaughton/bool

[NFC] fix more places where var is declared as boolean rather than bool

5 years ago[NFC] reformat UFFieldTest
eileen [Tue, 21 May 2019 19:43:00 +0000 (07:43 +1200)]
[NFC] reformat UFFieldTest

5 years ago[REF] extract buildGroupTree function
eileen [Wed, 22 May 2019 01:20:21 +0000 (13:20 +1200)]
[REF] extract buildGroupTree function

I did this mainly to surface the fact that the variables involved are factored into the cachekey

5 years agoCleanup profile test to not use discontinuted dbunit
eileen [Mon, 20 May 2019 21:37:02 +0000 (09:37 +1200)]
Cleanup profile test to not use discontinuted dbunit

5 years ago[NFC] fix comment blocks capitalising null
eileen [Thu, 23 May 2019 01:14:38 +0000 (13:14 +1200)]
[NFC] fix comment blocks capitalising null

From running the drupal code sniffer with type checking enabled it turns out the capitalisation of NULL
does not extend to docblocks.

See https://github.com/civicrm/coder/pull/7

5 years ago[NFC] fix more places where var is declared as boolean rather than bool
eileen [Thu, 23 May 2019 00:22:49 +0000 (12:22 +1200)]
[NFC] fix more places where var is declared as boolean rather than bool

See https://github.com/civicrm/coder/pull/7

5 years agoMerge pull request #14304 from eileenmcnaughton/dao
Eileen McNaughton [Thu, 23 May 2019 01:01:06 +0000 (13:01 +1200)]
Merge pull request #14304 from eileenmcnaughton/dao

[NFC] formatting & comment fixes - Regenerate DAO files

5 years agoMerge pull request #14282 from eileenmcnaughton/profiletest
colemanw [Thu, 23 May 2019 00:12:57 +0000 (20:12 -0400)]
Merge pull request #14282 from eileenmcnaughton/profiletest

[NFC] ProfileTest class - formatting & general cleanup

5 years agoRegenerate DAO files
eileen [Thu, 23 May 2019 00:12:04 +0000 (12:12 +1200)]
Regenerate DAO files

5 years agoMerge pull request #14295 from eileenmcnaughton/dao_2
colemanw [Thu, 23 May 2019 00:10:09 +0000 (20:10 -0400)]
Merge pull request #14295 from eileenmcnaughton/dao_2

[NFC] Add trailing comma to pseudoconstant array in DAOs

5 years agoMerge pull request #14300 from colemanw/Fix
colemanw [Thu, 23 May 2019 00:06:22 +0000 (20:06 -0400)]
Merge pull request #14300 from colemanw/Fix

[REF] Fix pointless use of CRM_Utils_Array::value in Campaign BAO

5 years agoMerge pull request #14294 from eileenmcnaughton/stds
colemanw [Thu, 23 May 2019 00:06:06 +0000 (20:06 -0400)]
Merge pull request #14294 from eileenmcnaughton/stds

[NFC] Fix variable types in DAO doc blocks

5 years agoMerge pull request #14296 from eileenmcnaughton/bool
colemanw [Thu, 23 May 2019 00:03:55 +0000 (20:03 -0400)]
Merge pull request #14296 from eileenmcnaughton/bool

[NFC] fix docblock types from boolean to bool

5 years agoMerge pull request #14297 from eileenmcnaughton/dedupe_cleanup
colemanw [Thu, 23 May 2019 00:01:41 +0000 (20:01 -0400)]
Merge pull request #14297 from eileenmcnaughton/dedupe_cleanup

[code-cleanup] remove orderBy param from getDuplicatePairs, it is not used

5 years agodev/drupal#19 Drupal8: fix bootstrap when used by the REST API
Mathieu Lutfy [Wed, 22 May 2019 23:59:28 +0000 (19:59 -0400)]
dev/drupal#19 Drupal8: fix bootstrap when used by the REST API

5 years agodev/financial/issues/56, Fixed Financial item entries
Pradeep Nayak [Wed, 22 May 2019 23:52:47 +0000 (00:52 +0100)]
dev/financial/issues/56, Fixed Financial item entries

5 years agoExtract function to create nuanced custom fields to a trait
eileen [Wed, 22 May 2019 23:53:10 +0000 (11:53 +1200)]
Extract function to create nuanced custom fields to a trait

I want to write a test involving set up of multiple custom fields - this seems like the most
useful function for that, so moving to a trait for re-use

5 years agoFix pointless use of CRM_Utils_Array::value in Campaign BAO
Coleman Watts [Wed, 22 May 2019 22:40:42 +0000 (18:40 -0400)]
Fix pointless use of CRM_Utils_Array::value in Campaign BAO

5 years agoMerge pull request #14283 from eileenmcnaughton/db_test3
colemanw [Wed, 22 May 2019 21:47:09 +0000 (17:47 -0400)]
Merge pull request #14283 from eileenmcnaughton/db_test3

dev/core#980 [dbunit] QueryTest Remove dbunit dependency on discontinued dbunit

5 years agoMerge pull request #14291 from eileenmcnaughton/refund_ev
colemanw [Wed, 22 May 2019 14:25:42 +0000 (10:25 -0400)]
Merge pull request #14291 from eileenmcnaughton/refund_ev

[NFC] array formatting, some comments

5 years agoMerge pull request #14288 from MegaphoneJon/access-page-simplify
Mathieu Lu [Wed, 22 May 2019 13:17:13 +0000 (09:17 -0400)]
Merge pull request #14288 from MegaphoneJon/access-page-simplify

[REF] Simplify ACL page template

5 years agoMerge pull request #14267 from eileenmcnaughton/setting_fin
Monish Deb [Wed, 22 May 2019 12:56:40 +0000 (18:26 +0530)]
Merge pull request #14267 from eileenmcnaughton/setting_fin

dev/financial#54 Fix mishandling of deferred revenue settings

5 years agoMerge pull request #14289 from eileenmcnaughton/event_dep
Eileen McNaughton [Wed, 22 May 2019 09:01:31 +0000 (21:01 +1200)]
Merge pull request #14289 from eileenmcnaughton/event_dep

Fix deprecation notice on manage events page

5 years ago[code-cleanup] remove orderBy param from getDuplicatePairs, it is not used
eileen [Wed, 22 May 2019 04:38:56 +0000 (16:38 +1200)]
[code-cleanup] remove orderBy param from getDuplicatePairs, it is not used

5 years ago[NFC] fix docblock types from boolean to bool
eileen [Wed, 22 May 2019 03:22:19 +0000 (15:22 +1200)]
[NFC] fix docblock types from boolean to bool

This is the correct type name we should be using

5 years agoAdd trailing comma to pseudoconstant array in DAOs
eileen [Wed, 22 May 2019 03:10:36 +0000 (15:10 +1200)]
Add trailing comma to pseudoconstant array in DAOs

Code change only includes sample - full regenerate will follow after merge

5 years agoFix variable types in DAO doc blocks
eileen [Wed, 22 May 2019 02:58:34 +0000 (14:58 +1200)]
Fix variable types in DAO doc blocks

Phpcs (stricter) reports

  79 | ERROR   | [x] Expected "intunsigned" but found "int unsigned" for @var tag in member variable comment
 156 | ERROR   | [x] Expected "bool" but found "boolean" for @var tag in member variable comment

We are declaring int unsigned instead of int & boolean instead of bool

Note this commit only contains sample of resulting change - will add more complete set after

5 years ago[NFC] ProfileTest class - formatting & general cleanup
eileen [Tue, 21 May 2019 21:11:20 +0000 (09:11 +1200)]
[NFC] ProfileTest class - formatting & general cleanup

5 years ago[NFC] array formatting, some comments
eileen [Tue, 21 May 2019 23:56:49 +0000 (11:56 +1200)]
[NFC] array formatting, some comments

5 years agoMerge pull request #14285 from civicrm/5.14
Eileen McNaughton [Tue, 21 May 2019 23:38:13 +0000 (11:38 +1200)]
Merge pull request #14285 from civicrm/5.14

5.14 to master

5 years agoFix deprecation notice on manage events page
eileen [Tue, 21 May 2019 22:36:43 +0000 (10:36 +1200)]
Fix deprecation notice on manage events page

5 years ago[REF] Simplify ACL page template
Jon Goldberg [Tue, 21 May 2019 21:59:36 +0000 (17:59 -0400)]
[REF] Simplify ACL page template

5 years agodev/core#980 [dbunit] Remove dbunit dependency on discontinued dbunit
eileen [Tue, 21 May 2019 01:13:02 +0000 (13:13 +1200)]
dev/core#980 [dbunit] Remove dbunit dependency on discontinued dbunit

5 years agoMerge pull request #14277 from seamuslee001/dev_core_976
Seamus Lee [Tue, 21 May 2019 21:18:32 +0000 (07:18 +1000)]
Merge pull request #14277 from seamuslee001/dev_core_976

Remove htmlpurifier from composer and move it back to within IDS to f…

5 years agoMerge pull request #12152 from JMAConsulting/dev_drupal_19
Mathieu Lu [Tue, 21 May 2019 15:59:57 +0000 (11:59 -0400)]
Merge pull request #12152 from JMAConsulting/dev_drupal_19

dev/drupal#19 Drupal8: Implement set UF locale/language (affects mailing tokens)

5 years agoDrupal#38 - allow creating absolute URLs from CLI in D8
Jon Goldberg [Wed, 28 Nov 2018 00:17:11 +0000 (19:17 -0500)]
Drupal#38 - allow creating absolute URLs from CLI in D8

5 years agoadditional fixes
Monish Deb [Wed, 10 Oct 2018 11:55:28 +0000 (17:25 +0530)]
additional fixes

5 years agooverride languageNegotiationURL for Drupal8
deb.monish [Mon, 21 May 2018 09:25:45 +0000 (14:55 +0530)]
override languageNegotiationURL for Drupal8

5 years ago(dev/drupal/19) Drupal8: Implement set UF locale/language (affects mailing tokens)
deb.monish [Wed, 16 May 2018 20:29:41 +0000 (01:59 +0530)]
(dev/drupal/19) Drupal8: Implement set UF locale/language (affects mailing tokens)

5 years agoFix legacy IPN endpoint for Drupal (gitlab issue 973)
Rich Lott [Tue, 21 May 2019 10:23:26 +0000 (11:23 +0100)]
Fix legacy IPN endpoint for Drupal (gitlab issue 973)

5 years agoMerge pull request #14278 from seamuslee001/nfc_langauge_cleanup
Eileen McNaughton [Tue, 21 May 2019 07:37:51 +0000 (19:37 +1200)]
Merge pull request #14278 from seamuslee001/nfc_langauge_cleanup

[NFC] Update Language to be more user friendly when checking logs

5 years agodev/financial#54 add routine to convert contribute settings
eileen [Sun, 19 May 2019 23:32:30 +0000 (11:32 +1200)]
dev/financial#54 add routine to convert contribute settings

5 years agodev/financial#54 check the correct place for deferred_revenut settings
Eileen McNaughton [Sun, 19 May 2019 22:09:59 +0000 (10:09 +1200)]
dev/financial#54 check the correct place for deferred_revenut settings

Currently we have a non-std store for invoicing settings that we are checking, yet the form saves it using our stds.

This updates checks for these settings to actually check the right place

5 years agoUpdate Language to be more user friendly when checking logs
Seamus Lee [Tue, 21 May 2019 06:08:32 +0000 (16:08 +1000)]
Update Language to be more user friendly when checking logs

5 years agoMerge pull request #14276 from eileenmcnaughton/dbunit_2
Seamus Lee [Tue, 21 May 2019 05:44:40 +0000 (15:44 +1000)]
Merge pull request #14276 from eileenmcnaughton/dbunit_2

Test cleanup to remove references to discontinued package dbunit

5 years agoRemove htmlpurifier from composer and move it back to within IDS to fix breakage...
Seamus Lee [Tue, 21 May 2019 02:31:32 +0000 (12:31 +1000)]
Remove htmlpurifier from composer and move it back to within IDS to fix breakage on drupal with the htmlpurifier module

5 years agoMerge pull request #14241 from colemanw/enableApi4
Seamus Lee [Tue, 21 May 2019 02:36:42 +0000 (12:36 +1000)]
Merge pull request #14241 from colemanw/enableApi4

Try enabling api4 extension in test suite

5 years agoMerge pull request #14274 from seamuslee001/protected_fields_dao
Seamus Lee [Tue, 21 May 2019 00:28:04 +0000 (10:28 +1000)]
Merge pull request #14274 from seamuslee001/protected_fields_dao

Declare API Key as a protected field for future use

5 years agoMerge pull request #14266 from seamuslee001/dev_core_369
Eileen McNaughton [Mon, 20 May 2019 23:17:55 +0000 (11:17 +1200)]
Merge pull request #14266 from seamuslee001/dev_core_369

dev/core#369 Prevent hard fail of API Job when SMS provider has been deleted

5 years ago[TEST] cleanup MailingContactTest to remove dbunit dependency
eileen [Mon, 20 May 2019 05:25:58 +0000 (17:25 +1200)]
[TEST] cleanup MailingContactTest to remove dbunit dependency

5 years agoRemove obsolete code
eileen [Mon, 20 May 2019 04:46:22 +0000 (16:46 +1200)]
Remove obsolete code

5 years agoClean up groupNesting Test to not use dbunit
eileen [Mon, 20 May 2019 04:46:07 +0000 (16:46 +1200)]
Clean up groupNesting Test to not use dbunit

5 years agoMerge pull request #14271 from eileenmcnaughton/db_test_towards
Seamus Lee [Mon, 20 May 2019 23:08:09 +0000 (09:08 +1000)]
Merge pull request #14271 from eileenmcnaughton/db_test_towards

[TEST SUITE] Remove some use of dbunit from tests

5 years agoMerge pull request #14273 from eileenmcnaughton/test_dupe
Seamus Lee [Mon, 20 May 2019 22:39:31 +0000 (08:39 +1000)]
Merge pull request #14273 from eileenmcnaughton/test_dupe

[NFC] array formatting in CRM_Dedupe_MergerTest

5 years agoDeclare API Key as a protected field for future use
Seamus Lee [Mon, 20 May 2019 22:19:36 +0000 (08:19 +1000)]
Declare API Key as a protected field for future use

5 years agoMerge pull request #14254 from yashodha/add_dev_tab
Eileen McNaughton [Mon, 20 May 2019 22:03:59 +0000 (10:03 +1200)]
Merge pull request #14254 from yashodha/add_dev_tab

add developer tab for summary report

5 years ago[NFC] minor commits cleanup
eileen [Mon, 20 May 2019 21:46:29 +0000 (09:46 +1200)]
[NFC] minor commits cleanup

5 years ago[NFC] array formatting in CRM_Dedupe_MergerTest
eileen [Mon, 20 May 2019 21:42:00 +0000 (09:42 +1200)]
[NFC] array formatting in CRM_Dedupe_MergerTest

5 years agoTry enabling api4 extension in test suite
Coleman Watts [Mon, 13 May 2019 13:06:26 +0000 (09:06 -0400)]
Try enabling api4 extension in test suite

5 years agoClean up groupNesting Test to not use dbunit
eileen [Mon, 20 May 2019 04:46:07 +0000 (16:46 +1200)]
Clean up groupNesting Test to not use dbunit

5 years agoRename agpl-3.0.txt to License (#14255)
Carlin Scott [Mon, 20 May 2019 19:51:22 +0000 (12:51 -0700)]
Rename agpl-3.0.txt to License (#14255)

* Rename agpl-3.0.txt to License

This is the standard name for the license file and will improve this project's community score from GitHub.

* Rename License to LICENSE

5 years agoMerge pull request #14270 from eileenmcnaughton/dedupe
colemanw [Mon, 20 May 2019 12:49:37 +0000 (08:49 -0400)]
Merge pull request #14270 from eileenmcnaughton/dedupe

[ref] Remove reference symbol from 2 variables

5 years agoMerge pull request #14137 from eileenmcnaughton/pay_up
Monish Deb [Mon, 20 May 2019 09:13:51 +0000 (14:43 +0530)]
Merge pull request #14137 from eileenmcnaughton/pay_up

[REF][Test] Remove call to CRM_Contribute_BAO_Contribution::recordAdditionalPayment in favour of payment create

5 years agoMore dbunit removal
eileen [Mon, 20 May 2019 03:48:07 +0000 (15:48 +1200)]
More dbunit removal

5 years agoRemove some use of dbunit from tests
eileen [Mon, 20 May 2019 03:32:38 +0000 (15:32 +1200)]
Remove some use of dbunit from tests

5 years agoRemove reference symbol from 2 variables
eileen [Mon, 20 May 2019 03:01:24 +0000 (15:01 +1200)]
Remove reference symbol from 2 variables

I checked & these are not altered in the function - so no need

5 years agoRemove call to CRM_Contribute_BAO_Contribution::recordAdditionalPayment in favour...
eileen [Fri, 26 Apr 2019 14:38:48 +0000 (02:38 +1200)]
Remove call to CRM_Contribute_BAO_Contribution::recordAdditionalPayment in favour of payment create

5 years agoAdd test of hard fail following SMS provider deletion and expand action schedule...
Seamus Lee [Sun, 19 May 2019 21:56:29 +0000 (07:56 +1000)]
Add test of hard fail following SMS provider deletion and expand action schedule testing to include SMSes

dev/core#369 Fix hard failure caused by setting of NULL in database for sms_provider_id when provider is deleted

Minor improvment to test ensure that is_error is actually 0

5 years agoMerge pull request #14260 from eileenmcnaughton/spec
Seamus Lee [Sun, 19 May 2019 22:58:46 +0000 (08:58 +1000)]
Merge pull request #14260 from eileenmcnaughton/spec

[REF+test] clean up code for getting labels for merge screen, stdise

5 years agoMerge pull request #14264 from colemanw/settingsOptions
Eileen McNaughton [Sun, 19 May 2019 22:03:36 +0000 (10:03 +1200)]
Merge pull request #14264 from colemanw/settingsOptions

[REF] Centralize logic for resolving settings pseudoconstants

5 years agoMerge pull request #14259 from colemanw/cacheOptions
Eileen McNaughton [Sun, 19 May 2019 21:32:54 +0000 (09:32 +1200)]
Merge pull request #14259 from colemanw/cacheOptions

Remove wasteful double-caching of settings metadata

5 years agoMerge pull request #14262 from francescbassas/patch-16
colemanw [Sun, 19 May 2019 12:12:08 +0000 (08:12 -0400)]
Merge pull request #14262 from francescbassas/patch-16

dev/core#964 Add start date and end date values on page contribution widget ajax response

5 years agoCentralize logic for resolving settings pseudoconstants
Coleman Watts [Fri, 17 May 2019 17:46:03 +0000 (13:46 -0400)]
Centralize logic for resolving settings pseudoconstants

5 years agodev/core#964 Add date start and end values on page contribution widget ajax response
francescbassas [Sun, 19 May 2019 08:26:47 +0000 (10:26 +0200)]
dev/core#964 Add date start and end values on page contribution widget ajax response

5 years agoMerge pull request #14263 from elisseck/dev/core/966
Eileen McNaughton [Sat, 18 May 2019 05:16:58 +0000 (17:16 +1200)]
Merge pull request #14263 from elisseck/dev/core/966

dev/core/966 skip urlencode for email in elavon xml

5 years ago[REF] code cleanup on handling on presentation of merge fields for display
eileenmcnaugton [Thu, 16 May 2019 06:09:38 +0000 (18:09 +1200)]
[REF] code cleanup on handling on presentation of merge fields for display

This code was really confusing - all that 'special values' stuff. Turned out it
didn't have to be....

5 years agoAdd unit test for handling of 'special values' when retrieving merge data
eileenmcnaugton [Thu, 16 May 2019 04:48:00 +0000 (16:48 +1200)]
Add unit test for handling of 'special values' when retrieving merge data

This is preliminary to a code cleanup.

m

5 years agoMerge pull request #14261 from eileenmcnaughton/master
colemanw [Fri, 17 May 2019 19:05:29 +0000 (15:05 -0400)]
Merge pull request #14261 from eileenmcnaughton/master

[REF] Remove extraneous variable

5 years agodev/core/966 skip urlencode for email in elavon xml
Eli Lisseck [Thu, 16 May 2019 18:33:47 +0000 (11:33 -0700)]
dev/core/966 skip urlencode for email in elavon xml

5 years agoRemove wasteful double-caching of settings metadata
Coleman Watts [Thu, 16 May 2019 03:35:14 +0000 (23:35 -0400)]
Remove wasteful double-caching of settings metadata

Settings metadata was being cached once per domain and one extra time for good measure.
hook_civicrm_alterSettingsMetaData() was invoked even when fetching cached data,
even though the hook-altered data was stored in the cache.

Now that the hook is invoked only once and the results cached, tests have been tweaked
to cache after setting the hook instead of before.