extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-16 18:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed 2 bugs with the new addressbook document templates

Browse Source
This commit is contained in:
Ralf Becker 2007-06-19 10:19:47 +00:00
parent 8cd9ca29ed
commit 1651819dce
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addressbook/inc/class.addressbook_merge.inc.php
View File

@ -85,6 +85,11 @@ class addressbook_merge // extends bo_merge
case 'cat_id': case 'cat_id':
if ($value) if ($value)
{ {
if (!is_object($GLOBALS['egw']->cats))
{
require_once(EGW_API_INC.'/class.categories.inc.php');
$GLOBALS['egw']->cats =& new categories;
}
$cats = array(); $cats = array();
foreach(is_array($value) ? $value : explode(',',$value) as $cat_id) foreach(is_array($value) ? $value : explode(',',$value) as $cat_id)
{ {
@ -148,7 +153,7 @@ class addressbook_merge // extends bo_merge
'relatives' => RELATIVE_ROOT, '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; return false;
} }
// generate replacements // generate replacements

2
addressbook/inc/class.uicontacts.inc.php
View File

@ -1874,7 +1874,7 @@ $readonlys['button[vcard]'] = true;
'must_exist' => 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'); require_once(EGW_INCLUDE_ROOT.'/addressbook/inc/class.addressbook_merge.inc.php');
$document_merge =& new addressbook_merge(); $document_merge =& new addressbook_merge();