mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-29 01:09:10 +01:00
another bug: if we dont order by cf's we dont need to extend the customfields by its tablename
This commit is contained in:
parent
8057d8b368
commit
6d36d46e90
@ -307,12 +307,15 @@ class socontacts_sql extends so_sql
|
|||||||
unset($criteria[$col]);
|
unset($criteria[$col]);
|
||||||
}
|
}
|
||||||
elseif($col == 'contact_value')
|
elseif($col == 'contact_value')
|
||||||
|
{
|
||||||
|
if ($order_by[0] == '#')
|
||||||
{
|
{
|
||||||
$criteria =array_merge($criteria,array('extra_order.contact_value'=>$val));
|
$criteria =array_merge($criteria,array('extra_order.contact_value'=>$val));
|
||||||
unset($criteria[$col]);
|
unset($criteria[$col]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if ($search_customfields) // search the custom-fields
|
if ($search_customfields) // search the custom-fields
|
||||||
{
|
{
|
||||||
$join .= $this->extra_join;
|
$join .= $this->extra_join;
|
||||||
|
Loading…
Reference in New Issue
Block a user