projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #13258 from eileenmcnaughton/isam
[civicrm-core.git]
/
CRM
/
Contact
/
Import
/
Parser.php
diff --git
a/CRM/Contact/Import/Parser.php
b/CRM/Contact/Import/Parser.php
index 9fe3464c8647f9312b5a2ee229ec86d7b72f5494..6a40dea23ff94e32898bbea78b99aa9e642ce715 100644
(file)
--- a/
CRM/Contact/Import/Parser.php
+++ b/
CRM/Contact/Import/Parser.php
@@
-275,9
+275,6
@@
abstract class CRM_Contact_Import_Parser extends CRM_Import_Parser {
break;
}
break;
}
- // clean up memory from dao's
- CRM_Core_DAO::freeResult();
-
// see if we've hit our timeout yet
/* if ( $the_thing_with_the_stuff ) {
do_something( );
// see if we've hit our timeout yet
/* if ( $the_thing_with_the_stuff ) {
do_something( );
@@
-907,7
+904,6
@@
abstract class CRM_Contact_Import_Parser extends CRM_Import_Parser {
break;
case 'CheckBox':
break;
case 'CheckBox':
- case 'AdvMulti-Select':
case 'Multi-Select':
if (!empty($formatted[$key]) && !empty($params[$key])) {
case 'Multi-Select':
if (!empty($formatted[$key]) && !empty($params[$key])) {
@@
-1217,7
+1213,6
@@
abstract class CRM_Contact_Import_Parser extends CRM_Import_Parser {
$htmlType = CRM_Utils_Array::value('html_type', $customFields[$customFieldID]);
switch ($htmlType) {
case 'CheckBox':
$htmlType = CRM_Utils_Array::value('html_type', $customFields[$customFieldID]);
switch ($htmlType) {
case 'CheckBox':
- case 'AdvMulti-Select':
case 'Multi-Select':
if ($val) {
$mulValues = explode(',', $val);
case 'Multi-Select':
if ($val) {
$mulValues = explode(',', $val);