From d18a0578b17bb8f273c005642ea556bc45c508dc Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 21 Sep 2015 17:58:40 +0000
Subject: [PATCH] Use importexport's more robust username parsing to try to
 avoid missing usernames.

---
 calendar/inc/class.calendar_import_csv.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/calendar/inc/class.calendar_import_csv.inc.php b/calendar/inc/class.calendar_import_csv.inc.php
index beffaacef2..82f22f3820 100644
--- a/calendar/inc/class.calendar_import_csv.inc.php
+++ b/calendar/inc/class.calendar_import_csv.inc.php
@@ -110,7 +110,7 @@ class calendar_import_csv extends importexport_basic_import_csv  {
 
 				// Search for direct account name, then user in accounts first
 				$search = "\"$name\"";
-				$id = $GLOBALS['egw']->accounts->name2id($name, 'account_fullname');
+				$id = importexport_helper_functions::account_name2id($name);
 				if(!$id) {
 					$contacts = ExecMethod2('addressbook.addressbook_bo.search', $search,array('contact_id','account_id'),'org_name,n_family,n_given,cat_id,contact_email','','%',false,'OR',array(0,1));
 					if($contacts) $id = $contacts[0]['account_id'] ? $contacts[0]['account_id'] : 'c'.$contacts[0]['contact_id'];