From abe612461c006cdec53a10d42f8855fa850c63ea Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 30 Nov 2011 18:01:29 +0000
Subject: [PATCH] Fix conditions using custom fields - needed extra query key

---
 infolog/inc/class.infolog_import_infologs_csv.inc.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/infolog/inc/class.infolog_import_infologs_csv.inc.php b/infolog/inc/class.infolog_import_infologs_csv.inc.php
index 1f69baf173..2fd3293746 100644
--- a/infolog/inc/class.infolog_import_infologs_csv.inc.php
+++ b/infolog/inc/class.infolog_import_infologs_csv.inc.php
@@ -165,7 +165,7 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin  {
 				$lookups['info_status'] = $this->boinfolog->status[$record['info_type']];
 			}
 
-			importexport_import_csv::convert($record, infolog_egw_record::$types, 'infolog', $lookups);
+			importexport_import_csv::convert($record, infolog_egw_record::$types, 'infolog', $lookups, $_definition->plugin_options['convert']);
 
 			// Set owner, unless it's supposed to come from CSV file
 			if($_definition->plugin_options['owner_from_csv']) {
@@ -200,6 +200,8 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin  {
 						case 'exists' :
 							if($record[$condition['string']]) {
 								$query['col_filter'] = array( $condition['string'] => $record[$condition['string']],);
+								// Needed to query custom fields
+								if($condition['string'][0] == '#') $query['custom_fields'] = true;
 								$results = $this->boinfolog->search($query);
 							}