From 77a285bbea870a79bcfe96444d479e9402d99eb2 Mon Sep 17 00:00:00 2001 From: nathangray Date: Wed, 31 May 2017 10:18:34 -0600 Subject: [PATCH] Addressbook - fix organisation view still showed all contacts --- addressbook/inc/class.addressbook_ui.inc.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php index abb395ff81..e4670ee6dc 100644 --- a/addressbook/inc/class.addressbook_ui.inc.php +++ b/addressbook/inc/class.addressbook_ui.inc.php @@ -1670,7 +1670,10 @@ window.egw_LAB.wait(function() { { list($name,$value) = explode(':',$part,2); // do NOT set invalid column, as this gives an SQL error ("AND AND" in sql) - if (static::$duplicate_fields[$name] && in_array($name, $fields) && $value) + if (static::$duplicate_fields[$name] && $value && ( + strpos($query['grouped_view'], 'duplicate:') === 0 && in_array($name, $fields) || + strpos($query['grouped_view'], 'duplicate:') !== 0 + )) { $query['col_filter'][$name] = $value; }