extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-25 14:41:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix for a sql error while searching and sort by customfield

Browse Source
This commit is contained in:
Klaus Leithoff 2008-04-07 09:29:19 +00:00
parent 273248da9e
commit 777ef7f4f7
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addressbook/inc/class.socontacts_sql.inc.php
View File

@ -235,6 +235,7 @@ class socontacts_sql extends so_sql
*/ */
function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false) function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
{ {
$this->debug=5;
if ((int) $this->debug >= 4) echo "<p>socontacts_sql::search(".print_r($criteria,true).",".print_r($only_keys,true).",'$order_by','$extra_cols','$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')</p>\n"; if ((int) $this->debug >= 4) echo "<p>socontacts_sql::search(".print_r($criteria,true).",".print_r($only_keys,true).",'$order_by','$extra_cols','$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')</p>\n";
$owner = isset($filter['owner']) ? $filter['owner'] : (isset($criteria['owner']) ? $criteria['owner'] : null); $owner = isset($filter['owner']) ? $filter['owner'] : (isset($criteria['owner']) ? $criteria['owner'] : null);
@ -304,6 +305,11 @@ class socontacts_sql extends so_sql
$criteria = array_merge($criteria,$this->_cat_search($val)); $criteria = array_merge($criteria,$this->_cat_search($val));
unset($criteria[$col]); unset($criteria[$col]);
} }
elseif($col == 'contact_value')
{
$criteria =array_merge($criteria,array('extra_order.contact_value'=>$val));
unset($criteria[$col]);
}
} }
} }
if ($search_customfields) // search the custom-fields if ($search_customfields) // search the custom-fields