From 1651819dce47928b123801f267cba816eb4659be Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 19 Jun 2007 10:19:47 +0000 Subject: [PATCH] fixed 2 bugs with the new addressbook document templates --- addressbook/inc/class.addressbook_merge.inc.php | 7 ++++++- addressbook/inc/class.uicontacts.inc.php | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/addressbook/inc/class.addressbook_merge.inc.php b/addressbook/inc/class.addressbook_merge.inc.php index bbd968d63e..42be281641 100644 --- a/addressbook/inc/class.addressbook_merge.inc.php +++ b/addressbook/inc/class.addressbook_merge.inc.php @@ -85,6 +85,11 @@ class addressbook_merge // extends bo_merge case 'cat_id': if ($value) { + if (!is_object($GLOBALS['egw']->cats)) + { + require_once(EGW_API_INC.'/class.categories.inc.php'); + $GLOBALS['egw']->cats =& new categories; + } $cats = array(); foreach(is_array($value) ? $value : explode(',',$value) as $cat_id) { @@ -148,7 +153,7 @@ class addressbook_merge // extends bo_merge 'relatives' => RELATIVE_ROOT, )))) { - $err = lang("Document '%1' does not exist or is not readable for you!"); + $err = lang("Document '%1' does not exist or is not readable for you!",$document); return false; } // generate replacements diff --git a/addressbook/inc/class.uicontacts.inc.php b/addressbook/inc/class.uicontacts.inc.php index 602ff8bfa1..ff912bcc90 100644 --- a/addressbook/inc/class.uicontacts.inc.php +++ b/addressbook/inc/class.uicontacts.inc.php @@ -1874,7 +1874,7 @@ $readonlys['button[vcard]'] = true; 'must_exist' => true, ))) { - return lang("Document '%1' does not exist or is not readable for you!"); + return lang("Document '%1' does not exist or is not readable for you!",$document); } require_once(EGW_INCLUDE_ROOT.'/addressbook/inc/class.addressbook_merge.inc.php'); $document_merge =& new addressbook_merge();