diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-10-10 21:39:03 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-10-10 21:39:03 +0000 |
| commit | 7ed3cf3b133aa980f110ebf6585d69448e2cb6ef (patch) | |
| tree | 339a7d195ff16193147088110d96493d4c99f34b /modules/field | |
| parent | 7bcd22f1c85cc20c3a0d959a216409ee0d8b66ad (diff) | |
| download | brdo-7ed3cf3b133aa980f110ebf6585d69448e2cb6ef.tar.gz brdo-7ed3cf3b133aa980f110ebf6585d69448e2cb6ef.tar.bz2 | |
#569238 by sun, swentel, catch: Changed Make check_markup() not cache by default.
Diffstat (limited to 'modules/field')
| -rw-r--r-- | modules/field/field.api.php | 8 | ||||
| -rw-r--r-- | modules/field/modules/text/text.module | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/modules/field/field.api.php b/modules/field/field.api.php index 9e9924f9b..52673a39c 100644 --- a/modules/field/field.api.php +++ b/modules/field/field.api.php @@ -278,9 +278,9 @@ function hook_field_load($obj_type, $objects, $field, $instances, $langcode, &$i // handled by hook_field_sanitize(). $format = $item['format']; if (filter_format_allowcache($format)) { - $items[$id][$delta]['safe'] = isset($item['value']) ? check_markup($item['value'], $format, $langcode, FALSE) : ''; + $items[$id][$delta]['safe'] = isset($item['value']) ? check_markup($item['value'], $format, $langcode) : ''; if ($field['type'] == 'text_with_summary') { - $items[$id][$delta]['safe_summary'] = isset($item['summary']) ? check_markup($item['summary'], $format, $langcode, FALSE) : ''; + $items[$id][$delta]['safe_summary'] = isset($item['summary']) ? check_markup($item['summary'], $format, $langcode) : ''; } } } @@ -322,9 +322,9 @@ function hook_field_sanitize($obj_type, $object, $field, $instance, $langcode, & if (!isset($items[$delta]['safe'])) { if (!empty($instance['settings']['text_processing'])) { $format = $item['format']; - $items[$delta]['safe'] = isset($item['value']) ? check_markup($item['value'], $format, $langcode) : ''; + $items[$delta]['safe'] = isset($item['value']) ? check_markup($item['value'], $format, $langcode, TRUE) : ''; if ($field['type'] == 'text_with_summary') { - $items[$delta]['safe_summary'] = isset($item['summary']) ? check_markup($item['summary'], $format, $langcode) : ''; + $items[$delta]['safe_summary'] = isset($item['summary']) ? check_markup($item['summary'], $format, $langcode, TRUE) : ''; } } else { diff --git a/modules/field/modules/text/text.module b/modules/field/modules/text/text.module index 4a88b1e3a..0579a8bcf 100644 --- a/modules/field/modules/text/text.module +++ b/modules/field/modules/text/text.module @@ -207,9 +207,9 @@ function text_field_load($obj_type, $objects, $field, $instances, $langcode, &$i // handled by text_field_sanitize(). $format = $item['format']; if (filter_format_allowcache($format)) { - $items[$id][$delta]['safe'] = isset($item['value']) ? check_markup($item['value'], $format, $langcode, FALSE) : ''; + $items[$id][$delta]['safe'] = isset($item['value']) ? check_markup($item['value'], $format, $langcode) : ''; if ($field['type'] == 'text_with_summary') { - $items[$id][$delta]['safe_summary'] = isset($item['summary']) ? check_markup($item['summary'], $format, $langcode, FALSE) : ''; + $items[$id][$delta]['safe_summary'] = isset($item['summary']) ? check_markup($item['summary'], $format, $langcode) : ''; } } } @@ -236,9 +236,9 @@ function text_field_sanitize($obj_type, $object, $field, $instance, $langcode, & if (!isset($items[$delta]['safe'])) { if (!empty($instance['settings']['text_processing'])) { $format = $item['format']; - $items[$delta]['safe'] = isset($item['value']) ? check_markup($item['value'], $format, $langcode) : ''; + $items[$delta]['safe'] = isset($item['value']) ? check_markup($item['value'], $format, $langcode, TRUE) : ''; if ($field['type'] == 'text_with_summary') { - $items[$delta]['safe_summary'] = isset($item['summary']) ? check_markup($item['summary'], $format, $langcode) : ''; + $items[$delta]['safe_summary'] = isset($item['summary']) ? check_markup($item['summary'], $format, $langcode, TRUE) : ''; } } else { |