holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moved declaration of categories var to bo class

Browse Source
This commit is contained in:
Christian Binder 2009-11-25 12:55:59 +00:00
parent ca9f3fe1eb
commit a7c2b81b85
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
calendar/inc/class.calendar_bo.inc.php
View File

@ -157,6 +157,12 @@ class calendar_bo
* @var egw_datetime
*/
var $datetime;
/**
* Instance of the categories class
*
* @var $categories
*/
var $categories;
/**
* Does a user require an extra invite grant, to be able to invite an other user, default no
@ -1307,9 +1313,9 @@ class calendar_bo
static $id2cat = array();
$cats = array();
$color = 0;
if (!is_object($this->cats))
if (!is_object($this->categories))
{
$this->cats = CreateObject('phpgwapi.categories','','calendar');
$this->categories = new categories($this->user,'calendar');
}
foreach(explode(',',$category) as $cat_id)
{
@ -1317,7 +1323,7 @@ class calendar_bo
if (!isset($id2cat[$cat_id]))
{
list($id2cat[$cat_id]) = $this->cats->return_single($cat_id);
list($id2cat[$cat_id]) = $this->categories->return_single($cat_id);
$id2cat[$cat_id]['data'] = unserialize($id2cat[$cat_id]['data']);
}
$cat = $id2cat[$cat_id];

2
calendar/inc/class.calendar_boupdate.inc.php
View File

@ -1123,8 +1123,6 @@ class calendar_boupdate extends calendar_bo
return $this->so->delete_alarm($id, $this->now_su);
}
var $categories;
/**
* Find existing categories in database by name or add categories that do not exist yet
* currently used for ical/sif import