diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-08-20 10:56:33 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-08-20 10:56:33 +0000 |
| commit | 5dd8314d0a76408969a6679e0574883917d0caf3 (patch) | |
| tree | 34344369b866dc4ff8751b9595162bb4d322b124 /modules/field | |
| parent | 0125b20cdab54dac2d0737123263cf6547d7623d (diff) | |
| download | brdo-5dd8314d0a76408969a6679e0574883917d0caf3.tar.gz brdo-5dd8314d0a76408969a6679e0574883917d0caf3.tar.bz2 | |
- Patch #446518 by sun: remove argument from check_markup().
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 f8d2137d9..7c78f889f 100644 --- a/modules/field/field.api.php +++ b/modules/field/field.api.php @@ -370,9 +370,9 @@ function hook_field_load($obj_type, $objects, $field, $instances, &$items, $age) $format = $item['format']; if (filter_format_allowcache($format)) { $lang = isset($object->language) ? $object->language : $language->language; - $items[$id][$delta]['safe'] = isset($item['value']) ? check_markup($item['value'], $format, $lang, FALSE, FALSE) : ''; + $items[$id][$delta]['safe'] = isset($item['value']) ? check_markup($item['value'], $format, $lang, FALSE) : ''; if ($field['type'] == 'text_with_summary') { - $items[$id][$delta]['safe_summary'] = isset($item['summary']) ? check_markup($item['summary'], $format, $lang, FALSE, FALSE) : ''; + $items[$id][$delta]['safe_summary'] = isset($item['summary']) ? check_markup($item['summary'], $format, $lang, FALSE) : ''; } } } @@ -414,9 +414,9 @@ function hook_field_sanitize($obj_type, $object, $field, $instance, $items) { if (!empty($instance['settings']['text_processing'])) { $format = $item['format']; $lang = isset($object->language) ? $object->language : $language->language; - $items[$delta]['safe'] = isset($item['value']) ? check_markup($item['value'], $format, $lang, FALSE) : ''; + $items[$delta]['safe'] = isset($item['value']) ? check_markup($item['value'], $format, $lang) : ''; if ($field['type'] == 'text_with_summary') { - $items[$delta]['safe_summary'] = isset($item['summary']) ? check_markup($item['summary'], $format, $lang, FALSE) : ''; + $items[$delta]['safe_summary'] = isset($item['summary']) ? check_markup($item['summary'], $format, $lang) : ''; } } else { diff --git a/modules/field/modules/text/text.module b/modules/field/modules/text/text.module index ba69c310b..c18356082 100644 --- a/modules/field/modules/text/text.module +++ b/modules/field/modules/text/text.module @@ -222,9 +222,9 @@ function text_field_load($obj_type, $objects, $field, $instances, &$items) { $format = $item['format']; if (filter_format_allowcache($format)) { $lang = isset($object->language) ? $object->language : $language->language; - $items[$id][$delta]['safe'] = isset($item['value']) ? check_markup($item['value'], $format, $lang, FALSE, FALSE) : ''; + $items[$id][$delta]['safe'] = isset($item['value']) ? check_markup($item['value'], $format, $lang, FALSE) : ''; if ($field['type'] == 'text_with_summary') { - $items[$id][$delta]['safe_summary'] = isset($item['summary']) ? check_markup($item['summary'], $format, $lang, FALSE, FALSE) : ''; + $items[$id][$delta]['safe_summary'] = isset($item['summary']) ? check_markup($item['summary'], $format, $lang, FALSE) : ''; } } } @@ -253,9 +253,9 @@ function text_field_sanitize($obj_type, $object, $field, $instance, &$items) { if (!empty($instance['settings']['text_processing'])) { $format = $item['format']; $lang = isset($object->language) ? $object->language : $language->language; - $items[$delta]['safe'] = isset($item['value']) ? check_markup($item['value'], $format, $lang, FALSE) : ''; + $items[$delta]['safe'] = isset($item['value']) ? check_markup($item['value'], $format, $lang) : ''; if ($field['type'] == 'text_with_summary') { - $items[$delta]['safe_summary'] = isset($item['summary']) ? check_markup($item['summary'], $format, $lang, FALSE) : ''; + $items[$delta]['safe_summary'] = isset($item['summary']) ? check_markup($item['summary'], $format, $lang) : ''; } } else { |