From c77636780a5e418e63ea81336be4542063fc771c Mon Sep 17 00:00:00 2001 From: damiankloip Date: Tue, 14 Aug 2012 18:39:18 +0200 Subject: [PATCH] Issue #1720400 by damiankloip: Fixed views_handler_filter_user_name() throws errors when using grouping filter option. --- modules/user/views_handler_filter_user_name.inc | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/user/views_handler_filter_user_name.inc b/modules/user/views_handler_filter_user_name.inc index f20196d31819..300607fe3ae1 100644 --- a/modules/user/views_handler_filter_user_name.inc +++ b/modules/user/views_handler_filter_user_name.inc @@ -74,9 +74,21 @@ class views_handler_filter_user_name extends views_handler_filter_in_operator { } $identifier = $this->options['expose']['identifier']; - $values = drupal_explode_tags($form_state['values'][$identifier]); + $input = $form_state['values'][$identifier]; - $uids = $this->validate_user_strings($form[$identifier], $values); + if ($this->options['is_grouped'] && isset($this->options['group_info']['group_items'][$input])) { + $this->operator = $this->options['group_info']['group_items'][$input]['operator']; + $input = $this->options['group_info']['group_items'][$input]['value']; + } + + $values = drupal_explode_tags($input); + + if (!$this->options['is_grouped'] || ($this->options['is_grouped'] && ($input != 'All'))) { + $uids = $this->validate_user_strings($form[$identifier], $values); + } + else { + $uids = FALSE; + } if ($uids) { $this->validated_exposed_input = $uids;