This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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]); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git link.module link.module | |
index 98c8b3a..c862795 100644 | |
--- link.module | |
+++ link.module | |
@@ -232,7 +232,7 @@ function link_field_validate($entity_type, $entity, $field, $instance, $langcode | |
} | |
} | |
- if ($instance['settings']['url'] == 'optional' && $instance['settings']['title'] == 'optional' && $instance['required'] && !$optional_field_found) { | |
+ if ($instance['settings']['url'] === 'optional' && $instance['settings']['title'] === 'optional' && $instance['required'] && !$optional_field_found) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git context.core.inc context.core.inc | |
index 5a85e8a..398356f 100644 | |
--- context.core.inc | |
+++ context.core.inc | |
@@ -209,22 +209,21 @@ function context_views_pre_view($view, $display) { | |
} | |
// Support Views overrides of specific entity paths. | |
if ($view->display_handler->has_path()) { | |
- switch ($view->display_handler->get_option('path')) { | |
- case 'taxonomy/term/%': |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git strongarm.admin.inc strongarm.admin.inc | |
index 9a82a24..87546e3 100644 | |
--- strongarm.admin.inc | |
+++ strongarm.admin.inc | |
@@ -20,7 +20,7 @@ function strongarm_admin_form($form_state) { | |
$storage = t('Hardcoded'); | |
$hardcoded = TRUE; | |
} | |
- elseif (isset($variable->in_code_only)) { | |
+ elseif (!empty($variable->in_code_only)) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/contrib/search_api_views/includes/handler_filter.inc b/contrib/search_api_views/includes/handler_filter.inc | |
index cc965da..3ac19f0 100644 | |
--- a/contrib/search_api_views/includes/handler_filter.inc | |
+++ b/contrib/search_api_views/includes/handler_filter.inc | |
@@ -37,6 +37,8 @@ class SearchApiViewsHandlerFilter extends views_handler_filter { | |
'<>' => t('Is not equal to'), | |
'>=' => t('Is greater than or equal to'), | |
'>' => t('Is greater than'), | |
+ 'NULL' => t('Is empty'), | |
+ 'NOT NULL' => t('Is not empty'), |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git legacy_reference.module legacy_reference.module | |
index 43ffc1b..99141da 100644 | |
--- legacy_reference.module | |
+++ legacy_reference.module | |
@@ -242,7 +242,7 @@ function legacy_reference_feeds_processor_targets_alter(&$targets, $entity_type, | |
if ($info['type'] == 'legacy_reference') { | |
$targets[$name] = array( | |
'name' => $instance['label'], | |
- 'callback' => 'field_feeds_set_target_text', | |
+ 'callback' => 'legacy_reference_feeds_set_target', |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/modules/taxonomy/taxonomy.admin.inc b/modules/taxonomy/taxonomy.admin.inc | |
index 828fde0..6f72f4d 100644 | |
--- a/modules/taxonomy/taxonomy.admin.inc | |
+++ b/modules/taxonomy/taxonomy.admin.inc | |
@@ -768,7 +768,7 @@ function taxonomy_form_term($form, &$form_state, $edit = array(), $vocabulary = | |
$form['actions']['delete'] = array( | |
'#type' => 'submit', | |
'#value' => t('Delete'), | |
- '#access' => user_access("delete terms in $vocabulary->vid") || user_access('administer taxonomy'), | |
+ '#access' => user_access("delete terms in $vocabulary->machine_name") || user_access('administer taxonomy'), |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/modules/taxonomy/views_handler_relationship_node_term_data.inc b/modules/taxonomy/views_handler_relationship_node_term_data.inc | |
index d7fbb4c..7046cfb 100644 | |
--- a/modules/taxonomy/views_handler_relationship_node_term_data.inc | |
+++ b/modules/taxonomy/views_handler_relationship_node_term_data.inc | |
@@ -54,10 +54,12 @@ class views_handler_relationship_node_term_data extends views_handler_relationsh | |
function query() { | |
$this->ensure_my_table(); | |
- $def = $this->definition; | |
+ $vocabularies = array_filter($this->options['vocabularies']); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/plugins/FeedsNodeProcessor.inc b/plugins/FeedsNodeProcessor.inc | |
index 2df4b35..06e5ae9 100644 | |
--- a/plugins/FeedsNodeProcessor.inc | |
+++ b/plugins/FeedsNodeProcessor.inc | |
@@ -219,6 +219,22 @@ class FeedsNodeProcessor extends FeedsProcessor { | |
$target_node->feeds['suppress_import'] = TRUE; | |
} | |
break; | |
+ case 'path_alias': | |
+ $target_node->path = array(); |
OlderNewer