civicrm-core.git
5 years agoCRM/Contact - Fix fatal error on tag search
Patrick Figel [Fri, 1 Mar 2019 18:28:27 +0000 (19:28 +0100)]
CRM/Contact - Fix fatal error on tag search

This fixes a fatal error caused by the CommaSeparatedIntegers not
accepting empty strings. This can be triggered by performing a
search with "Tag(s) IS NULL" using the search builder.

5 years agoAdd upgrade routine to convert on_hold to an array for sites with
eileen [Thu, 28 Feb 2019 21:44:22 +0000 (10:44 +1300)]
Add upgrade routine to convert on_hold to an array for sites with
civimail_multiple_bulk_emails set.

with that set we get a select box which needs an array rather than a checkbox.

Note from my testing there is problem loading the defaults due to the field name being
wrong - this aligns groups created before & after the 5.9 upgrade but does not resolve that.

    // preferred communication method
    if (Civi::settings()->get('civimail_multiple_bulk_emails')) {
      ->addSelect('email_on_hold',
        array('entity' => 'email', 'multiple' => 'multiple', 'label' => ts('Email On Hold'), 'options' => CRM_Core_PseudoConstant::emailOnHoldOptions()));
    }
    else {
      ->add('advcheckbox', 'email_on_hold', ts('Email On Hold')

5 years agodev/membership#10 fix incorrect validation error saying Start date must be the same...
eileen [Thu, 28 Feb 2019 22:33:13 +0000 (11:33 +1300)]
dev/membership#10 fix incorrect validation error saying Start date must be the same or later than Member since

This problem is because both dates exclude time but the default setting includes it - leading to a
comparison of a datetime with a date+midnight time

5 years agoMerge pull request #13745 from mattwire/viewcancelledrecur
Eileen McNaughton [Sat, 2 Mar 2019 05:06:47 +0000 (18:06 +1300)]
Merge pull request #13745 from mattwire/viewcancelledrecur

Allow viewing of cancelled recurring contributions

5 years agoAllow viewing of cancelled recurring contributions
Matthew Wire (MJW Consulting) [Mon, 11 Feb 2019 18:26:42 +0000 (18:26 +0000)]
Allow viewing of cancelled recurring contributions

5 years agoMerge pull request #13744 from mattwire/upgrader_fix
Eileen McNaughton [Fri, 1 Mar 2019 21:19:46 +0000 (10:19 +1300)]
Merge pull request #13744 from mattwire/upgrader_fix

Upgrader: Don't abort if state_province already exists

5 years agoDon't abort if state_province already exists when upgrading
Matthew Wire (MJW Consulting) [Fri, 1 Mar 2019 19:39:33 +0000 (19:39 +0000)]
Don't abort if state_province already exists when upgrading

5 years agoMerge pull request #13566 from pradpnayak/ModifiedBy
Monish Deb [Fri, 1 Mar 2019 13:56:38 +0000 (19:26 +0530)]
Merge pull request #13566 from pradpnayak/ModifiedBy

dev/core#708, Fix Qill for Added by and Modified By

5 years agoMerge pull request #13739 from seamuslee001/participant_payment_hook_correct
Eileen McNaughton [Fri, 1 Mar 2019 07:46:20 +0000 (20:46 +1300)]
Merge pull request #13739 from seamuslee001/participant_payment_hook_correct

Fix the invocation of post hook for ParticipantPayment ensuring that …

5 years agoMerge pull request #13718 from eileenmcnaughton/payment_ref
Monish Deb [Fri, 1 Mar 2019 04:42:37 +0000 (10:12 +0530)]
Merge pull request #13718 from eileenmcnaughton/payment_ref

Decommision getPartialPaymentTrxn function

5 years agoMerge pull request #13740 from civicrm/5.11
Eileen McNaughton [Fri, 1 Mar 2019 04:20:00 +0000 (17:20 +1300)]
Merge pull request #13740 from civicrm/5.11

5.11

5 years agoMerge pull request #13738 from jitendrapurohit/core-768-rc
Seamus Lee [Fri, 1 Mar 2019 04:03:01 +0000 (15:03 +1100)]
Merge pull request #13738 from jitendrapurohit/core-768-rc

dev/core#768 - Fix fatal error on group search

5 years agoMerge pull request #13737 from seamuslee001/pdf_receipts_fix_enotice
Eileen McNaughton [Fri, 1 Mar 2019 03:43:21 +0000 (16:43 +1300)]
Merge pull request #13737 from seamuslee001/pdf_receipts_fix_enotice

Fix up e-notice error when using a user from email address same issue…

5 years agoFix the invocation of post hook for ParticipantPayment ensuring that an id is passed...
Seamus Lee [Fri, 1 Mar 2019 02:46:22 +0000 (13:46 +1100)]
Fix the invocation of post hook for ParticipantPayment ensuring that an id is passed in post hook

5 years agodev/core#768 - Fix fatal error on group search
Jitendra Purohit [Fri, 1 Mar 2019 02:39:31 +0000 (08:09 +0530)]
dev/core#768 - Fix fatal error on group search

5 years agoMerge pull request #13724 from agileware/CIVIEWAY-42
Eileen McNaughton [Fri, 1 Mar 2019 02:27:35 +0000 (15:27 +1300)]
Merge pull request #13724 from agileware/CIVIEWAY-42

Status of test contribution is not fetched on ThankYou page.

5 years agoFix up e-notice error when using a user from email address same issue as dev/core#644
Seamus Lee [Fri, 1 Mar 2019 00:28:00 +0000 (11:28 +1100)]
Fix up e-notice error when using a user from email address same issue as dev/core#644

5 years agoMerge pull request #13736 from agileware/CIVICRM-1149
Eileen McNaughton [Fri, 1 Mar 2019 00:57:10 +0000 (13:57 +1300)]
Merge pull request #13736 from agileware/CIVICRM-1149

CiviCRM Membership Detail report, add column to display if membership is Primary or Inherited

5 years agoMerge pull request #13728 from JMAConsulting/dev/core#769
Eileen McNaughton [Fri, 1 Mar 2019 00:14:54 +0000 (13:14 +1300)]
Merge pull request #13728 from JMAConsulting/dev/core#769

dev/core#769 - Fix for ZipArchive->open() PHP bug

5 years agoMerge pull request #13732 from mattwire/refactor_smartgroupquery_upper1
Seamus Lee [Thu, 28 Feb 2019 23:43:03 +0000 (10:43 +1100)]
Merge pull request #13732 from mattwire/refactor_smartgroupquery_upper1

dev/core#748 Move UPPER() from sql to php domain

5 years agoMerge pull request #13730 from civicrm/5.11
Seamus Lee [Thu, 28 Feb 2019 22:35:56 +0000 (09:35 +1100)]
Merge pull request #13730 from civicrm/5.11

5.11

5 years agoMove UPPER() from sql to php domain
Matthew Wire (MJW Consulting) [Thu, 28 Feb 2019 21:25:17 +0000 (21:25 +0000)]
Move UPPER() from sql to php domain

5 years agoMerge pull request #13717 from eileenmcnaughton/extract
Eileen McNaughton [Thu, 28 Feb 2019 21:24:02 +0000 (10:24 +1300)]
Merge pull request #13717 from eileenmcnaughton/extract

[REF] Extract lines to add the pseudoconstant to the select

5 years agoMerge pull request #13723 from eileenmcnaughton/5.11
Eileen McNaughton [Thu, 28 Feb 2019 20:59:46 +0000 (09:59 +1300)]
Merge pull request #13723 from eileenmcnaughton/5.11

financial#46 - clean money format at form layer - Fix mistreatment of event fees > 1000 when saving

5 years agoMerge pull request #13729 from colemanw/recentitems
Eileen McNaughton [Thu, 28 Feb 2019 19:51:13 +0000 (08:51 +1300)]
Merge pull request #13729 from colemanw/recentitems

Mark de.systopia.recentitems obsolete

5 years agoMerge pull request #13725 from JMAConsulting/CRM-21754-rc
Eileen McNaughton [Thu, 28 Feb 2019 19:47:11 +0000 (08:47 +1300)]
Merge pull request #13725 from JMAConsulting/CRM-21754-rc

Don't break loop if address fields not found while formatting rows in Reports

5 years agoMark de.systopia.recentitems obsolete
Coleman Watts [Thu, 28 Feb 2019 15:47:55 +0000 (10:47 -0500)]
Mark de.systopia.recentitems obsolete

5 years agodev/core#769 - Fix for ZipArchive->open() PHP bug
Edsel [Thu, 28 Feb 2019 12:33:49 +0000 (18:03 +0530)]
dev/core#769 - Fix for ZipArchive->open() PHP bug

5 years agoDon't break loop if address fields not found while formatting rows in Reports
Monish Deb [Thu, 28 Feb 2019 09:49:29 +0000 (15:19 +0530)]
Don't break loop if address fields not found while formatting rows in Reports

5 years agoFix mistreatment of event fees > 1000 when saving
eileen [Thu, 28 Feb 2019 06:01:39 +0000 (19:01 +1300)]
Fix mistreatment of event fees > 1000 when saving

5 years agoMerge pull request #13721 from MegaphoneJon/5.11
Eileen McNaughton [Thu, 28 Feb 2019 05:33:35 +0000 (18:33 +1300)]
Merge pull request #13721 from MegaphoneJon/5.11

financial#46 - clean money format at form layer

5 years agoMerge pull request #13722 from civicrm/5.11
Eileen McNaughton [Thu, 28 Feb 2019 05:25:15 +0000 (18:25 +1300)]
Merge pull request #13722 from civicrm/5.11

5.11 to master

5 years agoMerge pull request #13711 from greenpeace-cee/fix-multi-currency-soft-credit
Eileen McNaughton [Thu, 28 Feb 2019 05:23:20 +0000 (18:23 +1300)]
Merge pull request #13711 from greenpeace-cee/fix-multi-currency-soft-credit

dev/core#756 - CRM/Contribute - Fix multi-currency soft credit summary

5 years agoMerge pull request #13704 from colemanw/age_asof_date
Eileen McNaughton [Thu, 28 Feb 2019 05:15:56 +0000 (18:15 +1300)]
Merge pull request #13704 from colemanw/age_asof_date

dev/core#561 Upgrade age_asof_date to datepicker in search

5 years agofinancial#46 - clean money format at form layer
Jon Goldberg [Thu, 28 Feb 2019 03:24:40 +0000 (22:24 -0500)]
financial#46 - clean money format at form layer

5 years agoDecommision getPartialPaymentTrxn function
eileen [Thu, 28 Feb 2019 02:33:19 +0000 (15:33 +1300)]
Decommision getPartialPaymentTrxn function

This function is only called from one place in the code & also from a test.

It is misleading as it implies a 'get' when it actually does an update
and it groups functionality in a way that doesn't make sense from the calling code pov

In this commit the function is removed and the lines are directly copied to the calling
function, as preparation for cleaning up the calling function

5 years agoSpelling fix
eileen [Thu, 28 Feb 2019 01:19:43 +0000 (14:19 +1300)]
Spelling fix

5 years agoExtract lines to add the pseudoconstant to the select
eileen [Thu, 28 Feb 2019 01:13:23 +0000 (14:13 +1300)]
Extract lines to add the pseudoconstant to the select

5 years agoMerge pull request #13686 from seamuslee001/phpword_upgrade
Eileen McNaughton [Wed, 27 Feb 2019 20:58:30 +0000 (09:58 +1300)]
Merge pull request #13686 from seamuslee001/phpword_upgrade

Upgrade PHPWord

5 years agodev/core#756 - CRM/Contribute - Fix multi-currency soft credit summary
Patrick Figel [Tue, 26 Feb 2019 20:06:13 +0000 (21:06 +0100)]
dev/core#756 - CRM/Contribute - Fix multi-currency soft credit summary

This fixes an exception caused by multiple currencies being passed to
CRM_Utils_Money::format. It also resolves some inconsistencies in how
the summary table is rendered for soft credits.

5 years agoUpgrade age_asof_date to datepicker in search
Coleman Watts [Mon, 25 Feb 2019 23:55:44 +0000 (18:55 -0500)]
Upgrade age_asof_date to datepicker in search

5 years agoCIVIEWAY-42: Unit test to verify the correct outcome message on ThankYou Page.
Alok Patel [Wed, 27 Feb 2019 13:46:31 +0000 (19:16 +0530)]
CIVIEWAY-42: Unit test to verify the correct outcome message on ThankYou Page.

5 years agoMerge pull request #13715 from eileenmcnaughton/order_fix
Monish Deb [Wed, 27 Feb 2019 09:15:46 +0000 (14:45 +0530)]
Merge pull request #13715 from eileenmcnaughton/order_fix

[minor cleanup] reduce params passed to searchQuery

5 years agoMerge pull request #13701 from colemanw/changeCaseTypeDate
Eileen McNaughton [Wed, 27 Feb 2019 08:04:55 +0000 (21:04 +1300)]
Merge pull request #13701 from colemanw/changeCaseTypeDate

Migrate date field to datepicker on ChangeCaseType form

5 years agoMerge pull request #13692 from eileenmcnaughton/extract_record
Monish Deb [Wed, 27 Feb 2019 07:36:29 +0000 (13:06 +0530)]
Merge pull request #13692 from eileenmcnaughton/extract_record

[REF] Extract recordPayment portion

5 years ago[minor cleanup] reduce params passed to searchQuery
eileen [Wed, 27 Feb 2019 03:48:40 +0000 (16:48 +1300)]
[minor cleanup] reduce params passed to searchQuery

Where we are retrieving the sql we can call the inner function rather than passing 'true'
in other cases we are passing default values through

5 years agoMerge pull request #13710 from civicrm/5.11
Eileen McNaughton [Tue, 26 Feb 2019 23:06:36 +0000 (12:06 +1300)]
Merge pull request #13710 from civicrm/5.11

Merge 5.11 to master

5 years agoMerge pull request #13696 from mattwire/entityform_13578_fix
Eileen McNaughton [Tue, 26 Feb 2019 20:55:36 +0000 (09:55 +1300)]
Merge pull request #13696 from mattwire/entityform_13578_fix

Move assign of currency for entityForm outside of foreach so order of fields don't matter

5 years agoMerge pull request #13705 from eileenmcnaughton/atest
colemanw [Tue, 26 Feb 2019 19:39:40 +0000 (14:39 -0500)]
Merge pull request #13705 from eileenmcnaughton/atest

[TEST FIX] Increase uniqueness in testSingleNowDates

5 years agoMerge pull request #13638 from eileenmcnaughton/squash_products
colemanw [Tue, 26 Feb 2019 18:41:24 +0000 (13:41 -0500)]
Merge pull request #13638 from eileenmcnaughton/squash_products

dev/core#735 Do not include product in search results if site has none

5 years agoMerge pull request #13645 from eileenmcnaughton/ft_acl_test
colemanw [Tue, 26 Feb 2019 18:34:41 +0000 (13:34 -0500)]
Merge pull request #13645 from eileenmcnaughton/ft_acl_test

Code cleanup - remove extraneous permissions clause

5 years agoMerge pull request #13709 from JMAConsulting/dev-core#757-rc
colemanw [Tue, 26 Feb 2019 17:44:48 +0000 (12:44 -0500)]
Merge pull request #13709 from JMAConsulting/dev-core#757-rc

Viewing Contact Note comments is broken in 5.10.4.

5 years agoMerge pull request #13680 from eileenmcnaughton/order_test
colemanw [Tue, 26 Feb 2019 17:35:42 +0000 (12:35 -0500)]
Merge pull request #13680 from eileenmcnaughton/order_test

Fix & test searchQuery order by to be less dependent on what is selected for search

5 years agoFix bug in test set up
eileen [Tue, 26 Feb 2019 16:28:08 +0000 (05:28 +1300)]
Fix bug in test set up

5 years agoExtract recordPayment portion
eileen [Mon, 25 Feb 2019 05:38:53 +0000 (18:38 +1300)]
Extract recordPayment portion

5 years agoViewing Contact Note comments is broken in 5.10.4.
Ken West [Tue, 26 Feb 2019 11:33:52 +0000 (22:33 +1100)]
Viewing Contact Note comments is broken in 5.10.4.
Update Javascript to use Note-NNNNN rather than cnote_NNNN as the ID of Note rows.
Completes change started in commit 57abcbbf5cf85b1266377e0ad9af4fb5865d5bc0.

5 years agoIncrease uniqueness in testSingleNowDates
eileen [Tue, 26 Feb 2019 06:43:11 +0000 (19:43 +1300)]
Increase uniqueness in testSingleNowDates

Reduce instances of
AuthorizeNet failed for unknown reason.E00012: You have submitted a duplicate of Subscription 5642898. A duplicate subscription will not be created

5 years agoMerge pull request #13702 from mattwire/contributionrecur_payprocid_pseudoconstant_schema
Seamus Lee [Tue, 26 Feb 2019 03:57:00 +0000 (14:57 +1100)]
Merge pull request #13702 from mattwire/contributionrecur_payprocid_pseudoconstant_schema

Add pseudoconstant for payment_processor_id to contributionrecur

5 years agoAdd pseudoconstant for payment_processor_id to contributionrecur
Matthew Wire (MJW Consulting) [Mon, 25 Feb 2019 21:40:05 +0000 (21:40 +0000)]
Add pseudoconstant for payment_processor_id to contributionrecur

5 years agoMerge pull request #13666 from eileenmcnaughton/case_fix
Seamus Lee [Mon, 25 Feb 2019 20:35:58 +0000 (07:35 +1100)]
Merge pull request #13666 from eileenmcnaughton/case_fix

dev/core#739 Fix case detail report breaking when sorted by case type.

5 years agoMerge pull request #13658 from mfb/temp-force-utf8
Eileen McNaughton [Mon, 25 Feb 2019 20:23:23 +0000 (09:23 +1300)]
Merge pull request #13658 from mfb/temp-force-utf8

Phase out CIVICRM_TEMP_FORCE_UTF8

5 years agoMerge pull request #13643 from eileenmcnaughton/recur
Eileen McNaughton [Mon, 25 Feb 2019 20:20:49 +0000 (09:20 +1300)]
Merge pull request #13643 from eileenmcnaughton/recur

[REF] minor refactor around retrieving processor id for recur

5 years agoMerge pull request #13694 from eileenmcnaughton/extract_refund
Eileen McNaughton [Mon, 25 Feb 2019 20:02:23 +0000 (09:02 +1300)]
Merge pull request #13694 from eileenmcnaughton/extract_refund

Extract record refund function

5 years agoMigrate date field to datepicker on ChangeCaseType form
Coleman Watts [Mon, 25 Feb 2019 19:12:54 +0000 (14:12 -0500)]
Migrate date field to datepicker on ChangeCaseType form

5 years agoExtract record refund function
eileen [Mon, 25 Feb 2019 05:03:33 +0000 (18:03 +1300)]
Extract record refund function

5 years agoMove assign of currency for entityForm outside of foreach so order of fields don...
Matthew Wire (MJW Consulting) [Mon, 25 Feb 2019 11:36:02 +0000 (11:36 +0000)]
Move assign of currency for entityForm outside of foreach so order of fields don't matter

5 years agoMerge pull request #13582 from colemanw/kam
Eileen McNaughton [Mon, 25 Feb 2019 10:50:50 +0000 (23:50 +1300)]
Merge pull request #13582 from colemanw/kam

Migrate KAM smartmenus to core

5 years agoUpgrade PHPWord
Seamus Lee [Sat, 23 Feb 2019 20:53:24 +0000 (07:53 +1100)]
Upgrade PHPWord

Patch phpword install to fix global handling of disable libxml entity loader

Fix phpoffice/common as well

5 years agoFix & test searchQuery order by to be less dependent on what is selected for search
eileen [Fri, 22 Feb 2019 20:49:12 +0000 (09:49 +1300)]
Fix & test searchQuery order by to be less dependent on what is selected for search

The pseudoconstant array is built when doing a select - if a field is in
order by but not select it will fail - as in the test.

This is a bit hard to hit outside the test for contribution but makes it more robust`
allowing us to address other bugs & performance issues.

5 years agoMerge pull request #13693 from civicrm/revert-13691-record_extract
Eileen McNaughton [Mon, 25 Feb 2019 05:55:35 +0000 (18:55 +1300)]
Merge pull request #13693 from civicrm/revert-13691-record_extract

Revert "[REF] Extract record refund function"

5 years agoRevert "[REF] Extract record refund function"
Eileen McNaughton [Mon, 25 Feb 2019 05:55:13 +0000 (18:55 +1300)]
Revert "[REF] Extract record refund function"

5 years agoMerge pull request #13691 from eileenmcnaughton/record_extract
Monish Deb [Mon, 25 Feb 2019 05:13:35 +0000 (10:43 +0530)]
Merge pull request #13691 from eileenmcnaughton/record_extract

[REF] Extract record refund function

5 years agoExtract record refund function
eileen [Mon, 25 Feb 2019 05:03:33 +0000 (18:03 +1300)]
Extract record refund function

5 years agoMerge pull request #13289 from mfb/pear-mail
Seamus Lee [Mon, 25 Feb 2019 03:06:44 +0000 (14:06 +1100)]
Merge pull request #13289 from mfb/pear-mail

Move pear/mail from packages to composer.json

5 years agoMerge pull request #13340 from mfb/street-number-max
Eileen McNaughton [Mon, 25 Feb 2019 02:51:52 +0000 (15:51 +1300)]
Merge pull request #13340 from mfb/street-number-max

Do not attempt to store out-of-range street number

5 years agodev/core#735 Do not include product in search results if site has none
eileen [Tue, 19 Feb 2019 04:23:21 +0000 (17:23 +1300)]
dev/core#735 Do not include product in search results if site has none

5 years agoMerge pull request #13668 from eileenmcnaughton/extract_order
colemanw [Mon, 25 Feb 2019 02:17:09 +0000 (21:17 -0500)]
Merge pull request #13668 from eileenmcnaughton/extract_order

[REF] Extract getSearchSQL from getSearchQuery.

5 years agoAdd test case for parsing out-of-range street number.
mark burdett [Sun, 24 Feb 2019 23:56:20 +0000 (15:56 -0800)]
Add test case for parsing out-of-range street number.

5 years agoMerge pull request #13688 from mfb/export-temp-table
Eileen McNaughton [Sun, 24 Feb 2019 23:54:18 +0000 (12:54 +1300)]
Merge pull request #13688 from mfb/export-temp-table

Use CRM_Utils_SQL_TempTable to drop and create table.

5 years agoDo not attempt to store out-of-range street number.
mark burdett [Sat, 22 Dec 2018 19:11:57 +0000 (11:11 -0800)]
Do not attempt to store out-of-range street number.

5 years agoMerge pull request #13276 from mfb/trash-change-log
Eileen McNaughton [Sun, 24 Feb 2019 23:30:15 +0000 (12:30 +1300)]
Merge pull request #13276 from mfb/trash-change-log

Record change log entry when contact is moved to or restored from trash

5 years agoMerge pull request #13346 from mfb/geocode-job-db-error
Eileen McNaughton [Sun, 24 Feb 2019 23:05:51 +0000 (12:05 +1300)]
Merge pull request #13346 from mfb/geocode-job-db-error

geocode job: Do not return more messages than can fit in the log data column

5 years agoDeprecate CIVICRM_TEMP_FORCE_UTF8.
mark burdett [Thu, 21 Feb 2019 21:56:23 +0000 (13:56 -0800)]
Deprecate CIVICRM_TEMP_FORCE_UTF8.

5 years agoMerge pull request #13578 from mattwire/entityform_view_towards
Eileen McNaughton [Sun, 24 Feb 2019 21:03:25 +0000 (10:03 +1300)]
Merge pull request #13578 from mattwire/entityform_view_towards

Towards supporting EntityForm for 'View Action'

5 years agoMerge pull request #13588 from jitendrapurohit/dev-631
Eileen McNaughton [Sun, 24 Feb 2019 20:29:31 +0000 (09:29 +1300)]
Merge pull request #13588 from jitendrapurohit/dev-631

dev/core#631 - Enable 'add new' by default on merge screen

5 years agoMerge pull request #13657 from MegaphoneJon/deprecateBasicContactFields
Eileen McNaughton [Sun, 24 Feb 2019 20:26:49 +0000 (09:26 +1300)]
Merge pull request #13657 from MegaphoneJon/deprecateBasicContactFields

reporting#9: parity between getContactFields and getBasicContactFields

5 years agoMerge pull request #13654 from seamuslee001/lab_core_742
Eileen McNaughton [Sun, 24 Feb 2019 20:14:41 +0000 (09:14 +1300)]
Merge pull request #13654 from seamuslee001/lab_core_742

dev/core#742 Fix XML parasing by swapping & for ,

5 years agoMerge pull request #13042 from jackrabbithanna/dev-core-475
Eileen McNaughton [Sun, 24 Feb 2019 20:09:39 +0000 (09:09 +1300)]
Merge pull request #13042 from jackrabbithanna/dev-core-475

only set custom field to null if it is really null, not string 'null'

5 years agoUse CRM_Utils_SQL_TempTable to drop and create table.
mark burdett [Sun, 24 Feb 2019 19:34:20 +0000 (11:34 -0800)]
Use CRM_Utils_SQL_TempTable to drop and create table.

5 years agoMerge pull request #12641 from mfb/reply-forwarding
Monish Deb [Sun, 24 Feb 2019 17:01:00 +0000 (22:31 +0530)]
Merge pull request #12641 from mfb/reply-forwarding

CiviMail: Fix reply forwarding for mailers with From: and Return-path: limitations

5 years agoMerge pull request #12337 from lcdservices/dev-core-190
Eileen McNaughton [Sun, 24 Feb 2019 06:57:45 +0000 (19:57 +1300)]
Merge pull request #12337 from lcdservices/dev-core-190

dev/core#190 / CRM-21643 ensure custom data multi record profile returns correct …

5 years agoMerge pull request #13441 from greenpeace-cee/fix-schema-parsing
Eileen McNaughton [Sun, 24 Feb 2019 05:20:17 +0000 (18:20 +1300)]
Merge pull request #13441 from greenpeace-cee/fix-schema-parsing

CRM/Logging - Fix various bugs in schema parsing

5 years agoMerge pull request #13682 from mfb/utf8mb4-check-exception
Eileen McNaughton [Sun, 24 Feb 2019 04:46:21 +0000 (17:46 +1300)]
Merge pull request #13682 from mfb/utf8mb4-check-exception

Force utf8mb4 query to throw exception as the check expects

5 years agoMerge pull request #13687 from eileenmcnaughton/activity_clean
Eileen McNaughton [Sun, 24 Feb 2019 04:42:24 +0000 (17:42 +1300)]
Merge pull request #13687 from eileenmcnaughton/activity_clean

Minor code cleanup

5 years agoMerge pull request #13634 from eileenmcnaughton/fin_type_speed
Seamus Lee [Sun, 24 Feb 2019 02:28:38 +0000 (13:28 +1100)]
Merge pull request #13634 from eileenmcnaughton/fin_type_speed

[NFC, test class] formatting, remove unused variables

5 years agoMinor code cleanup
Matthew Wire (MJW Consulting) [Sun, 24 Feb 2019 01:19:57 +0000 (14:19 +1300)]
Minor code cleanup

This is a reviewer's commit of https://github.com/civicrm/civicrm-core/pull/13672

I pulled out some lines I've checked & agree with to simplify that commit

5 years agoMerge pull request #13644 from mfb/temporary-tables
Eileen McNaughton [Sun, 24 Feb 2019 00:56:01 +0000 (13:56 +1300)]
Merge pull request #13644 from mfb/temporary-tables

Refactor CRM_Utils_SQL_TempTable::build()->createWithQuery($sql) interface to support MEMORY tabls

5 years agoCRM/Logging - Improve enum handling in schema diff
Patrick Figel [Fri, 25 Jan 2019 18:57:49 +0000 (19:57 +0100)]
CRM/Logging - Improve enum handling in schema diff

Instead of storing permitted enum values in the LENGTH array key
when extracting column information, this adds a separate ENUM_VALUES
key. When schema differences are calculated for enum columns, this
value triggers a change when new permitted values are added.

5 years agoCRM/Logging - Fix various bugs in schema parsing
Patrick Figel [Sun, 13 Jan 2019 18:11:41 +0000 (19:11 +0100)]
CRM/Logging - Fix various bugs in schema parsing

This fixes a couple of bugs in the schema parsing methods used by
Civi's extended logging feature:

- CRM_Logging_Schema::getIndexesForTable only queried for constraints,
  not returning any indexes.
- CRM_Logging_Schema::getIndexesForTable returned an array in the form
  [0 => ['constraint_name' => 'foo']] rather than the expected array
  of index names (i.e. ['foo']).
- CRM_Logging_Schema::columnSpecsOf contained an off-by-one error and
  a wrongly used substr parameter causing column lengths to include
  surrounding parenthesis. This would result in a "varchar(42)"
  column returning a length of "(42)" instead of "42".

5 years agoMerge pull request #13685 from seamuslee001/tests_746
Seamus Lee [Sat, 23 Feb 2019 07:23:37 +0000 (18:23 +1100)]
Merge pull request #13685 from seamuslee001/tests_746

dev/core#746 Add in unit tests to ensure that where clause is as is w…