diff --git a/addressbook/inc/class.boXport.inc.php b/addressbook/inc/class.boXport.inc.php index 3096bd0e3c..69140dbc7c 100644 --- a/addressbook/inc/class.boXport.inc.php +++ b/addressbook/inc/class.boXport.inc.php @@ -90,7 +90,7 @@ $this->cat_id = $data['cat_id']; } - function import($tsvfile,$conv_type,$private) + function import($tsvfile,$conv_type,$private,$fcat_id) { global $phpgw; @@ -221,7 +221,7 @@ } fclose($fp); - $buffer = $contacts->import_end_file($buffer,$private,$cat_id); + $buffer = $contacts->import_end_file($buffer,$private,$fcat_id); return $buffer; } diff --git a/addressbook/inc/class.uiXport.inc.php b/addressbook/inc/class.uiXport.inc.php index d8adea5ac9..5335c4dbcc 100644 --- a/addressbook/inc/class.uiXport.inc.php +++ b/addressbook/inc/class.uiXport.inc.php @@ -56,7 +56,7 @@ $jselect = ' onChange="this.form.submit();"'; } /* Setup all and none first */ - $cats_link = "\n" .'\n"; if (!$notall) { $cats_link .= '