extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-26 18:03:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix for bug [ 1446044 ] eGw asking for delete sub-categories when it not exists

Browse Source
This commit is contained in:
Ralf Becker 2006-03-10 09:53:10 +00:00
parent cfc4ad5006
commit db1a32aa33
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/inc/class.bocategories.inc.php
View File

@ -119,7 +119,7 @@
{ {
$data['type'] = $data['type'] ? $data['type'] : ''; $data['type'] = $data['type'] ? $data['type'] : '';
$data['cat_id'] = $data['cat_id'] ? $data['cat_id'] : ''; $data['cat_id'] = $data['cat_id'] ? $data['cat_id'] : '';
return $this->cats->exists($data['type'],$data['cat_name'],$data['cat_id']); return $this->cats->exists($data['type'],$data['cat_name'],$data['type'] == 'subs' ? 0 : $data['cat_id'],$data['type'] != 'subs' ? 0 : $data['cat_id']);
} }
function formatted_list($data) function formatted_list($data)

2
phpgwapi/inc/class.categories.inc.php
View File

@ -677,7 +677,7 @@
{ {
$where['cat_id'] = $cat_id; $where['cat_id'] = $cat_id;
} }
if ($parent) $where['cat_parent'] = $cat_parent; if ($parent) $where['cat_parent'] = $parent;
$this->db->select($this->table,'cat_id',$where,__LINE__,__FILE__); $this->db->select($this->table,'cat_id',$where,__LINE__,__FILE__);