From 8018a0f243ff635289d035013bf7dc438e0e99e5 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Wed, 1 Feb 2012 20:34:32 +0000 Subject: [PATCH] Make sure letter filter doesn't persist --- addressbook/inc/class.addressbook_ui.inc.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php index 15bf670c8c..15293f2366 100644 --- a/addressbook/inc/class.addressbook_ui.inc.php +++ b/addressbook/inc/class.addressbook_ui.inc.php @@ -1113,6 +1113,19 @@ class addressbook_ui extends addressbook_bo { // remove previous addEmail() calls, otherwise they will be run again egw_framework::set_onload(preg_replace('/addEmail\([^)]+\);/','',egw_framework::set_onload()),true); } + + // Make sure old lettersearch filter doesn't stay - current letter filter will be added later + foreach($query['col_filter'] as $key => $col_filter) + { + if(!is_numeric($key)) continue; + if(preg_match('/'.$GLOBALS['egw']->db->capabilities['case_insensitive_like']. + ' '.$GLOBALS['egw']->db->quote('[a-z]%').'$/',$col_filter) == 1 + ) + { + unset($query['col_filter'][$key]); + } + } + //echo "

uicontacts::get_rows(".print_r($query,true).")

\n"; if (!$id_only) {