Merge pull request #13638 from eileenmcnaughton/squash_products

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

diff --cc CRM/Contribute/BAO/Contribution.php
Simple merge

diff --cc CRM/Contribute/BAO/Query.php
Simple merge

diff --cc tests/phpunit/CRM/Export/BAO/ExportTest.php
index e8d25568a01b6fb2c7ef60b9e6a2a0dda96d3a2d,ce74aa6eeeea29a1d47a8790f4675ee6c2a5216c..fe4ae5b9fc394f2ed183626d4a0c4f33d96e0bfb
--- 1/tests/phpunit/CRM/Export/BAO/ExportTest.php
--- 2/tests/phpunit/CRM/Export/BAO/ExportTest.php
+++ b/tests/phpunit/CRM/Export/BAO/ExportTest.php
@@@ -2204,15 -2197,9 +2197,9 @@@ class CRM_Export_BAO_ExportTest extend
        97 => 'Currency',
        98 => 'Cancellation / Refund Reason',
        99 => 'Receipt Date',
-       100 => 'Product Name',
-       101 => 'SKU',
-       102 => 'Product Option',
-       103 => 'Fulfilled Date',
-       104 => 'Start date for premium',
-       105 => 'End date for premium',
        106 => 'Test',
        107 => 'Is Pay Later',
 -      108 => 'contribution_status',
 +      108 => 'Contribution Status',
        109 => 'Recurring Contribution ID',
        110 => 'Amount Label',
        111 => 'Contribution Note',
@@@ -2612,15 -2598,9 +2598,9 @@@
        'currency' => 'currency varchar(3)',
        'cancel_reason' => 'cancel_reason longtext',
        'receipt_date' => 'receipt_date varchar(32)',
-       'product_name' => 'product_name varchar(255)',
-       'sku' => 'sku varchar(50)',
-       'product_option' => 'product_option varchar(255)',
-       'fulfilled_date' => 'fulfilled_date varchar(32)',
-       'contribution_start_date' => 'contribution_start_date varchar(32)',
-       'contribution_end_date' => 'contribution_end_date varchar(32)',
        'is_test' => 'is_test varchar(16)',
        'is_pay_later' => 'is_pay_later varchar(16)',
 -      'contribution_status' => 'contribution_status text',
 +      'contribution_status' => 'contribution_status varchar(255)',
        'contribution_recur_id' => 'contribution_recur_id varchar(16)',
        'amount_level' => 'amount_level longtext',
        'contribution_note' => 'contribution_note text',