Project

General

Profile

Revision d719f12f

Added by Assos Assos over 8 years ago

Weekly update of contrib modules

View differences:

drupal7/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid.inc
195 195
        '#options' => $options,
196 196
        '#size' => min(9, count($options)),
197 197
        '#default_value' => $default_value,
198
        '#description' => t('Leave blank for all. Otherwise, the first selected term will be the default instead of "Any".'),
198 199
      );
199 200

  
200 201
      if (!empty($form_state['exposed']) && isset($identifier) && !isset($form_state['input'][$identifier])) {
......
228 229
      return TRUE;
229 230
    }
230 231

  
232
    // We need to know the operator, which is normally set in
233
    // views_handler_filter::accept_exposed_input(), before we actually call
234
    // the parent version of ourselves.
235
    if (!empty($this->options['expose']['use_operator']) && !empty($this->options['expose']['operator_id']) && isset($input[$this->options['expose']['operator_id']])) {
236
      $this->operator = $input[$this->options['expose']['operator_id']];
237
    }
238

  
231 239
    // If view is an attachment and is inheriting exposed filters, then assume
232 240
    // exposed input has already been validated
233 241
    if (!empty($this->view->is_attachment) && $this->view->display_handler->uses_exposed()) {
234 242
      $this->validated_exposed_input = (array) $this->view->exposed_raw_input[$this->options['expose']['identifier']];
235 243
    }
236 244

  
245
    // If we're checking for EMPTY or NOT, we don't need any input, and we can
246
    // say that our input conditions are met by just having the right operator.
247
    if ($this->operator == 'empty' || $this->operator == 'not empty') {
248
      return TRUE;
249
    }
250

  
237 251
    // If it's non-required and there's no value don't bother filtering.
238 252
    if (!$this->options['expose']['required'] && empty($this->validated_exposed_input)) {
239 253
      return FALSE;

Also available in: Unified diff