Projet

Général

Profil

Révision 1f623f01

Ajouté par Assos Assos il y a plus de 7 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/webform_validation/webform_validation.module
160 160

  
161 161
  if ($rules) {
162 162
    $component_definitions = webform_validation_prefix_keys($node->webform['components']);
163
    $sorter = webform_get_conditional_sorter($node);
164
    // If the form was retrieved from the form cache, the conditionals may not
165
    // have been executed yet.
166
    if (!$sorter->isExecuted()) {
167
      $sorter->executeConditionals(array(), 0);
168
    }
163 169
    // Remove hidden components.
164 170
    foreach ($component_definitions as $key => $component) {
165 171
      if (defined('WebformConditionals::componentShown')) {
166
        if (webform_get_conditional_sorter($node)->componentVisibility($component['cid'], $component['page_num']) !== WebformConditionals::componentShown) {
172
        if ($sorter->componentVisibility($component['cid'], $component['page_num']) !== WebformConditionals::componentShown) {
167 173
          unset($flat_values[$key]);
168 174
        }
169 175
      }

Formats disponibles : Unified diff