extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-28 01:29:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

A different strategy to fix sticky letter filter when reloading addressbook (r54293)

Browse Source
This commit is contained in:
Nathan Gray 2015-11-24 20:50:36 +00:00
parent 6fe2c71642
commit 15fb3c1d9a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -1329,7 +1329,7 @@ window.egw_LAB.wait(function() {
{ {
if(!is_numeric($key)) continue; if(!is_numeric($key)) continue;
if(preg_match('/'.$GLOBALS['egw']->db->capabilities['case_insensitive_like']. if(preg_match('/'.$GLOBALS['egw']->db->capabilities['case_insensitive_like'].
' '.$GLOBALS['egw']->db->quote('[a-z]%').'$/i',$col_filter) == 1 ' '.$GLOBALS['egw']->db->quote('[a-z]%').'$/',$col_filter) == 1
) )
{ {
unset($query['col_filter'][$key]); unset($query['col_filter'][$key]);
@ -1522,7 +1522,7 @@ window.egw_LAB.wait(function() {
{ {
$no_letter_search = array('adr_one_postalcode', 'adr_two_postalcode', 'contact_id', 'contact_created','contact_modified'); $no_letter_search = array('adr_one_postalcode', 'adr_two_postalcode', 'contact_id', 'contact_created','contact_modified');
$query['col_filter'][] = (in_array($query['order'],$no_letter_search) ? 'org_name' : (substr($query['order'],0,1)=='#'?'':'egw_addressbook.').$query['order']).' '. $query['col_filter'][] = (in_array($query['order'],$no_letter_search) ? 'org_name' : (substr($query['order'],0,1)=='#'?'':'egw_addressbook.').$query['order']).' '.
$GLOBALS['egw']->db->capabilities['case_insensitive_like'].' '.$GLOBALS['egw']->db->quote($query['searchletter'].'%'); $GLOBALS['egw']->db->capabilities['case_insensitive_like'].' '.$GLOBALS['egw']->db->quote(strtolower($query['searchletter']).'%');
} }
$wildcard = '%'; $wildcard = '%';
$op = 'OR'; $op = 'OR';