mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-04 20:40:14 +01:00
"fixed PHP Fatal error: Cannot assign by reference to overloaded object"
This commit is contained in:
parent
ed5db11312
commit
d155e3b5cd
@ -85,17 +85,12 @@ 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;
|
|
||||||
}
|
|
||||||
// if cat-tree is displayed, we return a full category path not just the name of the cat
|
// if cat-tree is displayed, we return a full category path not just the name of the cat
|
||||||
$use = $GLOBALS['egw_info']['server']['cat_tab'] == 'Tree' ? 'path' : 'name';
|
$use = $GLOBALS['egw_info']['server']['cat_tab'] == 'Tree' ? 'path' : 'name';
|
||||||
$cats = array();
|
$cats = array();
|
||||||
foreach(is_array($value) ? $value : explode(',',$value) as $cat_id)
|
foreach(is_array($value) ? $value : explode(',',$value) as $cat_id)
|
||||||
{
|
{
|
||||||
$cats[] = $GLOBALS['egw']->cats->id2name($cat_id,$use);
|
$cats[] = $GLOBALS['egw']->categories->id2name($cat_id,$use);
|
||||||
}
|
}
|
||||||
$value = implode(', ',$cats);
|
$value = implode(', ',$cats);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user