Projet

Général

Profil

Révision 13c3c9b4

Ajouté par Assos Assos il y a environ 9 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/views/handlers/views_handler_argument.inc
423 423
      $plugin->options_validate($form['argument_default'][$default_id], $form_state, $form_state['values']['options']['argument_default'][$default_id]);
424 424
    }
425 425

  
426
    // summary plugin
427
    $summary_id = $form_state['values']['options']['summary']['format'];
428
    $plugin = $this->get_plugin('style', $summary_id);
429
    if ($plugin) {
430
      $plugin->options_validate($form['summary']['options'][$summary_id], $form_state, $form_state['values']['options']['summary']['options'][$summary_id]);
426
    // Validate summary plugin options if one is present.
427
    if (isset($form_state['values']['options']['summary']['format'])) {
428
      $summary_id = $form_state['values']['options']['summary']['format'];
429
      $plugin = $this->get_plugin('style', $summary_id);
430
      if ($plugin) {
431
        $plugin->options_validate($form['summary']['options'][$summary_id], $form_state, $form_state['values']['options']['summary']['options'][$summary_id]);
432
      }
431 433
    }
432 434

  
433 435
    $validate_id = $form_state['values']['options']['validate']['type'];
......
453 455
      $form_state['values']['options']['default_argument_options'] = $options;
454 456
    }
455 457

  
456
    // summary plugin
457
    $summary_id = $form_state['values']['options']['summary']['format'];
458
    $plugin = $this->get_plugin('style', $summary_id);
459
    if ($plugin) {
460
      $options = &$form_state['values']['options']['summary']['options'][$summary_id];
461
      $plugin->options_submit($form['summary']['options'][$summary_id], $form_state, $options);
462
      // Copy the now submitted options to their final resting place so they get saved.
463
      $form_state['values']['options']['summary_options'] = $options;
458
    // Handle summary plugin options if one is present.
459
    if (isset($form_state['values']['options']['summary']['format'])) {
460
      $summary_id = $form_state['values']['options']['summary']['format'];
461
      $plugin = $this->get_plugin('style', $summary_id);
462
      if ($plugin) {
463
        $options = &$form_state['values']['options']['summary']['options'][$summary_id];
464
        $plugin->options_submit($form['summary']['options'][$summary_id], $form_state, $options);
465
        // Copy the now submitted options to their final resting place so they get saved.
466
        $form_state['values']['options']['summary_options'] = $options;
467
      }
464 468
    }
465 469

  
466 470
    $validate_id = $form_state['values']['options']['validate']['type'];

Formats disponibles : Unified diff