orakili

diff --git a/smart_trim.module b/smart_trim.module
index 1065112..88d9562 100644
--- a/smart_trim.module
+++ b/smart_trim.module
@@ -16,6 +16,7 @@ function smart_trim_field_formatter_info() {
         'more_text' => 'Read more',
         'summary_handler' => 'full',
         'trim_options' => array(),
+        'trim_preserve_tags' => '',
       ),

orakili

diff --git a/xmlsitemap.module b/xmlsitemap.module
index 93e935f..c48ac31 100644
--- a/xmlsitemap.module
+++ b/xmlsitemap.module
@@ -243,7 +243,16 @@ function xmlsitemap_cron() {

   // Regenerate the sitemap XML files.
   module_load_include('generate.inc', 'xmlsitemap');
-  xmlsitemap_run_unprogressive_batch('xmlsitemap_regenerate_batch');
+

orakili

diff --git a/contrib/search_api_facetapi/plugins/facetapi/query_type_date.inc b/contrib/search_api_facetapi/plugins/facetapi/query_type_date.inc
index 7277b56..0610d83 100644
--- a/contrib/search_api_facetapi/plugins/facetapi/query_type_date.inc
+++ b/contrib/search_api_facetapi/plugins/facetapi/query_type_date.inc
@@ -204,9 +204,15 @@ class SearchApiFacetapiDate extends SearchApiFacetapiTerm implements FacetapiQue
       }

       // Adds parent information if not already set.
-      if (NULL !== $parent && $parent != $new_value) {
-        $build[$parent]['#item_children'][$new_value] = &$build[$new_value];

orakili

diff --git a/taxonomy_revision.module b/taxonomy_revision.module
index ea72297..a796522 100644
--- a/taxonomy_revision.module
+++ b/taxonomy_revision.module
@@ -237,41 +237,55 @@ function taxonomy_revision_entity_info_alter(&$entity_info) {
  * Implements hook_field_attach_form().
  */
 function taxonomy_revision_field_attach_form($entity_type, $entity, &$form, &$form_state, $langcode) {
-  if ($entity_type == 'taxonomy_term' && !empty($entity->tid)) {
-    $form['revision_information'] = array(

orakili

diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index 379de71..761cc08 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -1715,6 +1715,15 @@ function taxonomy_rdf_mapping() {
 function taxonomy_field_presave($entity_type, $entity, $field, $instance, $langcode, &$items) {
   foreach ($items as $delta => $item) {
     if ($item['tid'] == 'autocreate') {
+      // Avoid duplicating tags within the same vocabulary.
+      $tid = db_query_range("SELECT tid FROM {taxonomy_term_data} WHERE name = :name AND vid = :vid", 0, 1, array(

orakili

diff --git includes/features.user.inc includes/features.user.inc
index c76455d..a11e078 100644
--- includes/features.user.inc
+++ includes/features.user.inc
@@ -26,12 +26,10 @@ function user_features_api() {
 function user_permission_features_export($data, &$export, $module_name = '') {
   $export['dependencies']['features'] = 'features';
 
-  // Ensure the modules that provide the given permissions are included as dependencies.
+  // Ensure the given permissions exist.

orakili

diff --git markdown.php markdown.php
index ed79197..0cde939 100644
--- markdown.php
+++ markdown.php
@@ -761,6 +761,17 @@ class Markdown_Parser {
 
 		$url = $this->encodeAttribute($url);
 
+		// For some links like [xxx](/node/xxx), turn them into absolute ones
+		// so when they're contained in feeds, the W3C feed validator won't

orakili

{
  "fundingDocumentURL": "http://reliefweb.int/updates?advanced-search=(C226.C122)_(F4)_!(S1242)_!(S1741)_!(S1255)_!(PC254)_!(S4304)#content",
  "dataSources": [
    {
      "dataItemTitle": "Iraq Strategic Response Plan 2015",
      "dataSourceURL": "http://fts.unocha.org/reports/daily/OCHA_R32sum_A1097.PDF",
      "clusters": {
        "type": "request",
        "source": "fts",
        "path": "v1/cluster/appeal/1097.json",

orakili

diff --git a/taxonomy_revision.module b/taxonomy_revision.module
index ea72297..4ca3018 100644
--- a/taxonomy_revision.module
+++ b/taxonomy_revision.module
@@ -315,7 +315,7 @@ function _taxonomy_revision_taxonomy_term_save_revision($term) {
 
   // Save over an existing revision if requested.
   if (isset($term->revision_id) && $term->revision_id && empty($term->revision)) {
-    drupal_write_record('taxonomy_term_data_revision', $term);
+    drupal_write_record('taxonomy_term_data_revision', $term, array('revision_id'));

orakili

diff --git a/context.module b/context.module
index 5c0bd5c..5db5763 100644
--- a/context.module
+++ b/context.module
@@ -244,8 +244,10 @@ function context_preprocess_menu_link(&$variables) {
         // - Do not add class twice on current page.
         if (in_array($variables['element']['#href'], $reaction_menu_paths) && $variables['element']['#href'] != $_GET['q']) {
           // Do not add the 'active' class twice in views tabs.
-          if (!in_array('active', $variables['element']['#localized_options']['attributes']['class'])) {
-            $variables['element']['#localized_options']['attributes']['class'][] = 'active';