orakili

diff --git modules/taxonomy/taxonomy.module modules/taxonomy/taxonomy.module
index 45639a1..a6ee42c 100644
--- modules/taxonomy/taxonomy.module
+++ modules/taxonomy/taxonomy.module
@@ -1619,8 +1619,10 @@ function taxonomy_field_presave($entity_type, $entity, $field, $instance, $langc
 function taxonomy_field_insert($entity_type, $entity, $field, $instance, $langcode, &$items) {
   // We maintain a denormalized table of term/node relationships, containing
   // only data for current, published nodes.
-  if (variable_get('taxonomy_maintain_index_table', TRUE) && $field['storage']['type'] == 'field_sql_storage' && $entity_type == 'node' && $entity->status) {
-    _taxonomy_field_save_index($entity, $items);

orakili

diff --git messaging_template/messaging_template.module messaging_template/messaging_template.module
index 05eacf2..435a2d3 100644
--- messaging_template/messaging_template.module
+++ messaging_template/messaging_template.module
@@ -121,8 +121,10 @@ function messaging_template_pre_render_element($element) {
     '#method' => $element['#method'],
   );
   foreach (element_children($element) as $index) {
-    $element[$index] = $properties + $element[$index];
-    $element[$index] = messaging_template_pre_render_element($element[$index]);