diff --git a/date_views/includes/date_views_filter_handler_simple.inc b/date_views/includes/date_views_filter_handler_simple.inc index f10ed0c..c0ffd33 100644 --- a/date_views/includes/date_views_filter_handler_simple.inc +++ b/date_views/includes/date_views_filter_handler_simple.inc @@ -62,6 +62,9 @@ class date_views_filter_handler_simple extends views_handler_filter_date { $default_date = ''; if (empty($options)) { if ($this->options['is_grouped']) { + if ($this->options['group_info']['default_group'] = 'All') { + return ''; + } $options = $this->options['group_info']['group_items'][$this->options['group_info']['default_group']]['value'][$prefix . '_group']; } else { @@ -112,12 +115,12 @@ class date_views_filter_handler_simple extends views_handler_filter_date { if (empty($this->options['exposed'])) { return str_replace(' ', 'T', $this->date_default_value($prefix)); } - elseif ($this->options['is_grouped'] && isset($_GET[$this->options['group_info']['identifier']])) { - $identifier = $_GET[$this->options['group_info']['identifier']]; + elseif ($this->options['is_grouped'] && isset($this->view->exposed_raw_input[$this->options['group_info']['identifier']]['value'])) { + $identifier = $this->view->exposed_raw_input[$this->options['group_info']['identifier']]; $options = $this->options['group_info']['group_items'][$identifier]['value'][$prefix . '_group']; return str_replace(' ', 'T', $this->date_default_value($prefix, $options)); } - elseif (isset($this->options['expose']['identifier']) && !isset($_GET[$this->options['expose']['identifier']])) { + elseif (isset($this->options['expose']['identifier']) && !isset($this->view->exposed_raw_input[$this->options['expose']['identifier']]['value'])) { return str_replace(' ', 'T', $this->date_default_value($prefix)); } } @@ -483,6 +486,10 @@ class date_views_filter_handler_simple extends views_handler_filter_date { $options = &$form_state['values']['options']; + if (!isset($options['operator'])) { + return; + } + if ($options['operator'] == 'between' || $options['operator'] == 'not between') { if ($options['value']['min_group']['min_choose_input_type'] == 'relative') { if (empty($options['value']['min_group']['default_date'])) {