r27402 - /branches/1.6/calendar/inc/class.calendar_ical.inc.php

Author: leithoff
Date: Thu Jul  9 10:34:28 2009
New Revision: 27402

URL: http://www.egroupware.org/viewvc/egroupware?rev=27402&view=rev
Log:
fix for "Column 'account_id' in field list is ambiguous" ERROR while importing events 2nd.go

Modified:
    branches/1.6/calendar/inc/class.calendar_ical.inc.php

Modified: branches/1.6/calendar/inc/class.calendar_ical.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/branches/1.6/calendar/inc/class.calendar_ical.inc.php?rev=27402&r1=27401&r2=27402&view=diff
==============================================================================
--- branches/1.6/calendar/inc/class.calendar_ical.inc.php (original)
+++ branches/1.6/calendar/inc/class.calendar_ical.inc.php Thu Jul  9 10:34:28 2009
@@ -829,7 +829,7 @@
  continue; // participants without email AND CN --> ignore it
  }
  elseif ((list($data) = ExecMethod2('addressbook.addressbook_bo.search',$searcharray,
- array('id','account_id','n_fn'),'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC','','',false,'OR')))
+ array('id','egw_addressbook.account_id as account_id','n_fn'),'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC','','',false,'OR')))
  {
  $uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
  }


------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge  
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize  
details at: http://p.sf.net/sfu/Challenge
_______________________________________________
eGroupWare-cvs mailing list
eGroupWare-cvs@...
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs