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

Allow categories->return_sorted_array() to use a filter too

Browse Source
This commit is contained in:
Nathan Gray 2011-06-15 22:32:52 +00:00
parent 3d9a9fc9de
commit e9cc2549ac
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -321,7 +321,7 @@ class categories
* @param boolean $unserialize_data=false return $cat['data'] as array (not serialized array) * @param boolean $unserialize_data=false return $cat['data'] as array (not serialized array)
* @return array with cats * @return array with cats
*/ */
function return_sorted_array($start=0,$limit=True,$query='',$sort='ASC',$order='cat_name',$globals=False, $parent_id=0,$unserialize_data=false) function return_sorted_array($start=0,$limit=True,$query='',$sort='ASC',$order='cat_name',$globals=False, $parent_id=0,$unserialize_data=false,$filter=null)
{ {
if (!$sort) $sort = 'ASC'; if (!$sort) $sort = 'ASC';
if (!$order) $order = 'cat_name'; if (!$order) $order = 'cat_name';
@ -329,7 +329,7 @@ class categories
//error_log(__METHOD__."($start,$limit,$query,$sort,$order,globals=$globals,parent=$parent_id,$unserialize_data) account_id=$this->account_id, appname=$this->app_name: ".function_backtrace()); //error_log(__METHOD__."($start,$limit,$query,$sort,$order,globals=$globals,parent=$parent_id,$unserialize_data) account_id=$this->account_id, appname=$this->app_name: ".function_backtrace());
$parents = $cats = array(); $parents = $cats = array();
if (!($cats = $this->return_array('all',0,false,$query,$sort,$order,$globals,(array)$parent_id,-1,'',null,$unserialize_data))) if (!($cats = $this->return_array('all',0,false,$query,$sort,$order,$globals,(array)$parent_id,-1,'',$filter,$unserialize_data)))
{ {
$cats = array(); $cats = array();
} }
@ -339,7 +339,7 @@ class categories
} }
while (count($parents)) while (count($parents))
{ {
if (!($subs = $this->return_array('all',0,false,$query,$sort,$order,$globals,$parents,-1,'',null,$unserialize_data))) if (!($subs = $this->return_array('all',0,false,$query,$sort,$order,$globals,$parents,-1,'',$filter,$unserialize_data)))
{ {
break; break;
} }