updated ctools, panels, date, diff

2017-05-24 19:22:50 +02:00
parent 542ac42fca
commit 9acef9d37e
189 changed files with 2928 additions and 1797 deletions
--- a/sites/all/modules/contrib/fields/date/date.module
+++ b/sites/all/modules/contrib/fields/date/date.module
@@ -443,7 +443,12 @@ function date_formatter_format($formatter, $settings, $granularity = array(), $l
      return 'date_plain';

    default:
-      $format = date_format_type_format($format_type, $langcode);
+      if ($format_type == 'custom') {
+        $format = $settings['custom_date_format'];
+      }
+      else {
+        $format = date_format_type_format($format_type, $langcode);
+      }
      break;
  }