summaryrefslogtreecommitdiff
path: root/modules/field/field.api.php
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2009-10-10 21:39:03 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2009-10-10 21:39:03 +0000
commit7ed3cf3b133aa980f110ebf6585d69448e2cb6ef (patch)
tree339a7d195ff16193147088110d96493d4c99f34b /modules/field/field.api.php
parent7bcd22f1c85cc20c3a0d959a216409ee0d8b66ad (diff)
downloadbrdo-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/field.api.php')
-rw-r--r--modules/field/field.api.php8
1 files changed, 4 insertions, 4 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 {