From 6d51f918420afd9cfeabadc01e6d41e9a48cd648 Mon Sep 17 00:00:00 2001 From: nathangray Date: Wed, 18 Jul 2018 13:43:32 -0600 Subject: [PATCH] * Addressbook - Fix bug preventing turning off letter filter after some actions --- addressbook/inc/class.addressbook_ui.inc.php | 2 +- api/js/etemplate/et2_extension_nextmatch.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php index a9b482ddde..decf37ef5e 100644 --- a/addressbook/inc/class.addressbook_ui.inc.php +++ b/addressbook/inc/class.addressbook_ui.inc.php @@ -1560,7 +1560,7 @@ window.egw_LAB.wait(function() { { if(!is_numeric($key)) continue; if(preg_match('/'.$GLOBALS['egw']->db->capabilities['case_insensitive_like']. - ' '.$GLOBALS['egw']->db->quote('[a-z]%').'$/',$col_filter) == 1 + ' '.$GLOBALS['egw']->db->quote('[a-z]%').'$/i',$col_filter) == 1 ) { unset($query['col_filter'][$key]); diff --git a/api/js/etemplate/et2_extension_nextmatch.js b/api/js/etemplate/et2_extension_nextmatch.js index 9458792187..7b6bb6dfa9 100644 --- a/api/js/etemplate/et2_extension_nextmatch.js +++ b/api/js/etemplate/et2_extension_nextmatch.js @@ -2859,10 +2859,10 @@ var et2_nextmatch_header_bar = (function(){ "use strict"; return et2_DOMWidget.e if(this.nextmatch.options.settings.lettersearch) { jQuery("td",this.lettersearch).removeClass("lettersearch_active"); - jQuery(filters.searchletter ? "td#"+filters.searchletter : "td.lettersearch[id='']").addClass("lettersearch_active"); + jQuery(filters.searchletter ? "td#"+filters.searchletter : "td.lettersearch[id='']",this.lettersearch).addClass("lettersearch_active"); // Set activeFilters to current value - filters.searchletter = jQuery("td.lettersearch_active").attr("id"); + filters.searchletter = jQuery("td.lettersearch_active",this.lettersearch).attr("id") || false; } // Reset flag