summaryrefslogtreecommitdiff
path: root/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_name.inc
diff options
context:
space:
mode:
Diffstat (limited to 'kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_name.inc')
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_name.inc21
1 files changed, 19 insertions, 2 deletions
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_name.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_name.inc
index c885e1b..300607f 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_name.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_name.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_filter_user_name.
+ */
+
+/**
* Filter handler for usernames.
*
* @ingroup views_filter_handlers
@@ -69,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];
+
+ 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);
- $uids = $this->validate_user_strings($form[$identifier], $values);
+ 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;