projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor phone type CRM-12464
[civicrm-core.git]
/
CRM
/
Core
/
BAO
/
Mapping.php
diff --git
a/CRM/Core/BAO/Mapping.php
b/CRM/Core/BAO/Mapping.php
index d931339530cd80f2d5d2c71d79ac12e58ebf3a3d..326f4443e4fbb014f4051f83ded88a06e5f3f17d 100644
(file)
--- a/
CRM/Core/BAO/Mapping.php
+++ b/
CRM/Core/BAO/Mapping.php
@@
-565,7
+565,7
@@
class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping {
$sel3[''] = NULL;
$sel5[''] = NULL;
$sel3[''] = NULL;
$sel5[''] = NULL;
- $phoneTypes = CRM_Core_PseudoConstant::
phoneType(
);
+ $phoneTypes = CRM_Core_PseudoConstant::
get('CRM_Core_DAO_Phone', 'phone_type_id'
);
$imProviders = CRM_Core_PseudoConstant::IMProvider();
asort($phoneTypes);
$imProviders = CRM_Core_PseudoConstant::IMProvider();
asort($phoneTypes);
@@
-1024,7
+1024,8
@@
class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping {
}
}
}
}
- if ($v[0] == 'Contribution' && substr($fldName, 0, 7) != 'custom_') {
+ if ($v[0] == 'Contribution' && substr($fldName, 0, 7) != 'custom_'
+ && substr($fldName, 0, 10) != 'financial_') {
if (substr($fldName, 0, 13) != 'contribution_') {
$fldName = 'contribution_' . $fldName;
}
if (substr($fldName, 0, 13) != 'contribution_') {
$fldName = 'contribution_' . $fldName;
}