security update core+modules

2015-04-26 18:38:56 +02:00
parent 2f45ea820a
commit 7c96373038
1022 changed files with 30319 additions and 11259 deletions
--- a/sites/all/modules/rules/includes/rules.upgrade.inc
+++ b/sites/all/modules/rules/includes/rules.upgrade.inc
@@ -190,8 +190,8 @@ function rules_upgrade_convert_rule_set($name, $cfg_old) {
  $config = rules_plugin_factory('rule set');
  $config->name = $name;
  foreach (array('label', 'weight') as $key) {
-    if (isset($element[$key])) {
-      $target->$key = $element[$key];
+    if (isset($cfg_old[$key])) {
+      $config->$key = $cfg_old[$key];
    }
  }
  if (isset($cfg_old['arguments'])) {