Projet

Général

Profil

Révision a5ba142b

Ajouté par Assos Assos il y a presque 6 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/rules/includes/rules.core.inc
113 113
      $error_msg = t('Unable to parse the pasted export.');
114 114
      return FALSE;
115 115
    }
116
    // The key ist the configuration name and the value the actual export.
117
    list($name, $export) = each($export);
116
    // The key is the configuration name and the value the actual export.
117
    $name = key($export);
118
    $export = current($export);
118 119
    if (!isset($export['PLUGIN'])) {
119 120
      $error_msg = t('Export misses plugin information.');
120 121
      return FALSE;
drupal7/sites/all/modules/rules/rules.info
22 22
dependencies[] = entity_token
23 23
dependencies[] = entity
24 24

  
25
; Information added by Drupal.org packaging script on 2017-04-20
26
version = "7.x-2.10"
25
; Information added by Drupal.org packaging script on 2018-05-18
26
version = "7.x-2.11"
27 27
core = "7.x"
28 28
project = "rules"
29
datestamp = "1492697958"
30

  
29
datestamp = "1526653388"
drupal7/sites/all/modules/rules/rules.install
513 513
 * Switch out the rules_event_whitelist variable for a cache equivalent.
514 514
 */
515 515
function rules_update_7214() {
516
  // Enable Rules if currently disabled so that this update won't fail.
517
  $disable_rules = FALSE;
518
  if (!module_exists('rules')) {
519
    module_enable(array('rules'));
520
    $disable_rules = TRUE;
521
  }
516 522
  // Set new event_whitelist cache cid.
517 523
  rules_set_cache('rules_event_whitelist', variable_get('rules_event_whitelist', array()));
518 524
  // Delete old conf variable.
......
525 531
  rules_get_cache();
526 532
  _rules_rebuild_component_cache();
527 533
  RulesEventSet::rebuildEventCache();
534
  // Disable Rules again if it was disabled before this update started.
535
  if ($disable_rules) {
536
    module_disable(array('rules'));
537
  }
528 538
}
529 539

  
530 540
/**
drupal7/sites/all/modules/rules/rules.module
4 4
 * @file Rules engine module
5 5
 */
6 6

  
7
// The class autoloader may fail for classes added in 7.x-2.4 (Issue 2090511).
8
if (!drupal_autoload_class('RulesEventHandlerEntityBundle')) {
9
  require_once dirname(__FILE__) . '/includes/rules.event.inc';
10
}
11

  
7 12
// Include our hook implementations early, as they can be called even before
8 13
// hook_init().
9 14
require_once dirname(__FILE__) . '/modules/events.inc';
......
1020 1025
  $event_name = $args[0];
1021 1026
  unset($args[0]);
1022 1027
  // We maintain a whitelist of configured events to reduces the number of cache
1023
  // reads. If the whitelist is empty we proceed and it is rebuilt.
1028
  // reads. If the whitelist is not in the cache we proceed and it is rebuilt.
1024 1029
  if (rules_event_invocation_enabled()) {
1025 1030
    $whitelist = rules_get_cache('rules_event_whitelist');
1026
    if ((empty($whitelist) || isset($whitelist[$event_name])) && $event = rules_get_cache('event_' . $event_name)) {
1031
    if ((($whitelist === FALSE) || isset($whitelist[$event_name])) && $event = rules_get_cache('event_' . $event_name)) {
1027 1032
      $event->executeByArgs($args);
1028 1033
    }
1029 1034
  }
drupal7/sites/all/modules/rules/rules_admin/rules_admin.info
6 6
files[] = rules_admin.inc
7 7
dependencies[] = rules
8 8

  
9
; Information added by Drupal.org packaging script on 2017-04-20
10
version = "7.x-2.10"
9
; Information added by Drupal.org packaging script on 2018-05-18
10
version = "7.x-2.11"
11 11
core = "7.x"
12 12
project = "rules"
13
datestamp = "1492697958"
14

  
13
datestamp = "1526653388"
drupal7/sites/all/modules/rules/rules_i18n/rules_i18n.info
7 7
files[] = rules_i18n.i18n.inc
8 8
files[] = rules_i18n.rules.inc
9 9
files[] = rules_i18n.test
10
; Information added by Drupal.org packaging script on 2017-04-20
11
version = "7.x-2.10"
10
; Information added by Drupal.org packaging script on 2018-05-18
11
version = "7.x-2.11"
12 12
core = "7.x"
13 13
project = "rules"
14
datestamp = "1492697958"
15

  
14
datestamp = "1526653388"
drupal7/sites/all/modules/rules/rules_scheduler/rules_scheduler.info
13 13
files[] = includes/rules_scheduler.views.inc
14 14
files[] = includes/rules_scheduler_views_filter.inc
15 15

  
16
; Information added by Drupal.org packaging script on 2017-04-20
17
version = "7.x-2.10"
16
; Information added by Drupal.org packaging script on 2018-05-18
17
version = "7.x-2.11"
18 18
core = "7.x"
19 19
project = "rules"
20
datestamp = "1492697958"
21

  
20
datestamp = "1526653388"
drupal7/sites/all/modules/rules/rules_scheduler/tests/rules_scheduler_test.info
5 5
files[] = rules_scheduler_test.inc
6 6
hidden = TRUE
7 7

  
8
; Information added by Drupal.org packaging script on 2017-04-20
9
version = "7.x-2.10"
8
; Information added by Drupal.org packaging script on 2018-05-18
9
version = "7.x-2.11"
10 10
core = "7.x"
11 11
project = "rules"
12
datestamp = "1492697958"
13

  
12
datestamp = "1526653388"
drupal7/sites/all/modules/rules/tests/rules_test.info
6 6
files[] = rules_test.rules_defaults.inc
7 7
hidden = TRUE
8 8

  
9
; Information added by Drupal.org packaging script on 2017-04-20
10
version = "7.x-2.10"
9
; Information added by Drupal.org packaging script on 2018-05-18
10
version = "7.x-2.11"
11 11
core = "7.x"
12 12
project = "rules"
13
datestamp = "1492697958"
14

  
13
datestamp = "1526653388"
drupal7/sites/all/modules/rules/tests/rules_test_invocation.info
4 4
core = 7.x
5 5
hidden = TRUE
6 6

  
7
; Information added by Drupal.org packaging script on 2017-04-20
8
version = "7.x-2.10"
7
; Information added by Drupal.org packaging script on 2018-05-18
8
version = "7.x-2.11"
9 9
core = "7.x"
10 10
project = "rules"
11
datestamp = "1492697958"
12

  
11
datestamp = "1526653388"
drupal7/sites/all/modules/rules/ui/ui.plugins.inc
17 17
    $this->conditions = $this->rule->conditionContainer();
18 18
  }
19 19

  
20
  public function form(&$form, &$form_state, $options = array()) {
20
  public function form(&$form, &$form_state, $options = array(), $iterator = NULL) {
21 21
    $form_state['rules_element'] = $this->rule;
22 22
    $label = $this->element->label();
23 23
    // Automatically add a counter to unlabelled rules.
......
84 84
 */
85 85
class RulesReactionRuleUI extends RulesRuleUI {
86 86

  
87
  public function form(&$form, &$form_state, $options = array()) {
87
  public function form(&$form, &$form_state, $options = array(), $iterator = NULL) {
88 88
    $form['events'] = array(
89 89
      '#type' => 'container',
90 90
      '#weight' => -10,
......
193 193
 */
194 194
class RulesLoopUI extends RulesActionContainerUI {
195 195

  
196
  public function form(&$form, &$form_state, $options = array()) {
196
  public function form(&$form, &$form_state, $options = array(), $iterator = NULL) {
197 197
    parent::form($form, $form_state, $options);
198 198
    $settings = $this->element->settings;
199 199

  
drupal7/sites/all/modules/votingapi/votingapi.info
12 12
files[] = views/votingapi_views_handler_sort_nullable.inc
13 13
files[] = views/votingapi_views_handler_relationship.inc
14 14

  
15
; Information added by Drupal.org packaging script on 2018-04-01
16
version = "7.x-2.14"
15
; Information added by Drupal.org packaging script on 2018-05-20
16
version = "7.x-2.15"
17 17
core = "7.x"
18 18
project = "votingapi"
19
datestamp = "1522602501"
20

  
19
datestamp = "1526810587"
drupal7/sites/all/modules/votingapi/votingapi.module
191 191
    // If the calling function didn't explicitly set criteria for vote deletion,
192 192
    // build up the delete queries here.
193 193
    foreach ($votes as $vote) {
194
      $tmp = $vote + votingapi_current_user_identifier();
194
      $identifier_info = votingapi_current_user_identifier();
195
      // Make sure we're dealing with an array to avoid errors.
196
      if (is_array($vote) && is_array($identifier_info)) {
197
        $tmp = $vote + $identifier_info;
198
      }
195 199
      if (isset($tmp['value'])) {
196 200
        unset($tmp['value']);
197 201
      }
......
657 661
 */
658 662
function _votingapi_prep_vote(&$vote) {
659 663
  global $user;
660
  if (empty($vote['prepped'])) {
664
  if (is_array($vote) && empty($vote['prepped'])) {
661 665
    $vote += array(
662 666
      'entity_type' => 'node',
663 667
      'value_type' => 'percent',

Formats disponibles : Unified diff