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

some bugfixes related to empty database

Browse Source
This commit is contained in:
Cornelius Weiß 2005-02-12 17:32:38 +00:00
parent 3460c4f058
commit 9034ef788c
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/inc/class.so_resources.inc.php
View File

@ -47,7 +47,7 @@ class so_resources
{ {
$wherecats .= ($wherecats ? " OR " : " AND ( " ) .'cat_id' . "='".$cat_id."'"; $wherecats .= ($wherecats ? " OR " : " AND ( " ) .'cat_id' . "='".$cat_id."'";
} }
$wherecats .= " ) "; $wherecats .= $wherecats ? " ) " : "";
$this->db->query( 'SELECT '.$select." FROM ".$this->rs_table." WHERE ".$where.$wherecats. $this->db->query( 'SELECT '.$select." FROM ".$this->rs_table." WHERE ".$where.$wherecats.
($order_by != '' ? " ORDER BY $order_by" : ''),__LINE__,__FILE__); ($order_by != '' ? " ORDER BY $order_by" : ''),__LINE__,__FILE__);

3
resources/inc/class.ui_resources.inc.php
View File

@ -70,8 +70,7 @@ class ui_resources
$content['nm']['no_filter'] = False; $content['nm']['no_filter'] = False;
$content['nm']['filter_label'] = lang('Category'); $content['nm']['filter_label'] = lang('Category');
$content['nm']['filter_help'] = lang('Select a category'); // is this used??? $content['nm']['filter_help'] = lang('Select a category'); // is this used???
$content['nm']['options-filter']= array('0' => lang('all categories')); $content['nm']['options-filter']= array('0'=>lang('all categories'))+(array)$this->bo->acl->get_cats(PHPGW_ACL_READ);
$content['nm']['options-filter']+= $this->bo->acl->get_cats(PHPGW_ACL_READ);
$content['nm']['no_filter2'] = True; $content['nm']['no_filter2'] = True;
$content['nm']['no_cat'] = True; $content['nm']['no_cat'] = True;