projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CRM-20199 Remove poor join on option_value table when doing contribution search.
[civicrm-core.git]
/
CRM
/
Core
/
BAO
/
Mapping.php
diff --git
a/CRM/Core/BAO/Mapping.php
b/CRM/Core/BAO/Mapping.php
index f19b49839b0689f94620df9303cdda9c09872881..d45ef17529c997fbcfb439b56d9a15f760509565 100644
(file)
--- a/
CRM/Core/BAO/Mapping.php
+++ b/
CRM/Core/BAO/Mapping.php
@@
-381,7
+381,7
@@
class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping {
if (($mappingType == 'Search Builder') || ($exportMode == CRM_Export_Form_Select::CONTRIBUTE_EXPORT)) {
if (CRM_Core_Permission::access('CiviContribute')) {
if (($mappingType == 'Search Builder') || ($exportMode == CRM_Export_Form_Select::CONTRIBUTE_EXPORT)) {
if (CRM_Core_Permission::access('CiviContribute')) {
- $fields['Contribution'] = CRM_Contribute_BAO_Contribution::
exportableField
s();
+ $fields['Contribution'] = CRM_Contribute_BAO_Contribution::
getExportableFieldsWithPseudoConstant
s();
unset($fields['Contribution']['contribution_contact_id']);
$compArray['Contribution'] = ts('Contribution');
}
unset($fields['Contribution']['contribution_contact_id']);
$compArray['Contribution'] = ts('Contribution');
}
@@
-1126,7
+1126,7
@@
class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping {
* @return NULL
*/
public static function saveMappingFields(&$params, $mappingId) {
* @return NULL
*/
public static function saveMappingFields(&$params, $mappingId) {
- //delete mapping fields records for exi
x
ting mapping
+ //delete mapping fields records for exi
s
ting mapping
$mappingFields = new CRM_Core_DAO_MappingField();
$mappingFields->mapping_id = $mappingId;
$mappingFields->delete();
$mappingFields = new CRM_Core_DAO_MappingField();
$mappingFields->mapping_id = $mappingId;
$mappingFields->delete();