Projet

Général

Profil

Révision a2baadd1

Ajouté par Assos Assos il y a environ 10 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/webform_validation/webform_validation.rules.inc
9 9
 * Get a rule entry
10 10
 */
11 11
function webform_validation_get_rule($ruleid) {
12
  $result = db_query("SELECT ruleid, rulename, nid, validator, data, error_message, negate FROM {webform_validation_rule} WHERE ruleid = :ruleid", array(':ruleid' => $ruleid), array('fetch' => PDO::FETCH_ASSOC));
12
  $result = db_query("SELECT ruleid, rulename, nid, validator, data, error_message, negate, weight FROM {webform_validation_rule} WHERE ruleid = :ruleid", array(':ruleid' => $ruleid), array('fetch' => PDO::FETCH_ASSOC));
13 13
  $rule = $result->fetchAssoc();
14 14
  $rule['components'] = webform_validation_get_rule_components($ruleid, $rule['nid']);
15 15
  $rule['negate'] = (bool) $rule['negate'];
......
21 21
 */
22 22
function webform_validation_get_node_rules($nid) {
23 23
  $rules = array();
24
  $result = db_query("SELECT ruleid, rulename, nid, validator, data, error_message, negate FROM {webform_validation_rule} WHERE nid = :nid ORDER BY ruleid DESC", array(':nid' => $nid), array('fetch' => PDO::FETCH_ASSOC));
24
  $result = db_query("SELECT ruleid, rulename, nid, validator, data, error_message, negate, weight FROM {webform_validation_rule} WHERE nid = :nid ORDER BY weight ASC, ruleid DESC", array(':nid' => $nid), array('fetch' => PDO::FETCH_ASSOC));
25 25
  foreach ($result as $rule) {
26 26
    $rule['components'] = webform_validation_get_rule_components($rule['ruleid'], $rule['nid']);
27 27
    $rule['negate'] = (bool) $rule['negate'];
......
79 79
}
80 80

  
81 81
/**
82
 * Delete a rule and dependencies
82
 * Delete a rule and dependencies.
83
 *
84
 * @param int $ruleid
85
 *   The ruleid of the rule to delete.
83 86
 */
84 87
function webform_dynamic_delete_rule($ruleid) {
85
  // delete rule
88
  // Delete rule.
86 89
  db_delete('webform_validation_rule')
87
  ->condition('ruleid', $ruleid)
88
  ->execute();
89
  // delete rule components
90
    ->condition('ruleid', $ruleid)
91
    ->execute();
92
  // Delete rule components.
90 93
  db_delete('webform_validation_rule_components')
91
  ->condition('ruleid', $ruleid)
92
  ->execute();
94
    ->condition('ruleid', $ruleid)
95
    ->execute();
93 96
}

Formats disponibles : Unified diff