diff options
Diffstat (limited to 'modules/field')
| -rw-r--r-- | modules/field/modules/text/text.module | 9 | ||||
| -rw-r--r-- | modules/field/modules/text/text.test | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/modules/field/modules/text/text.module b/modules/field/modules/text/text.module index 1399bcdbd..16de61de5 100644 --- a/modules/field/modules/text/text.module +++ b/modules/field/modules/text/text.module @@ -600,16 +600,13 @@ function text_field_prepare_translation($entity_type, $entity, $field, $instance /** * Implements hook_filter_format_update(). */ -function text_filter_format_update() { +function text_filter_format_update($format) { field_cache_clear(); } /** - * Implements hook_filter_format_delete(). - * - * @todo D8: Properly update filter format references in all fields. See - * http://drupal.org/node/556022 for details. + * Implements hook_filter_format_disable(). */ -function text_filter_format_delete() { +function text_filter_format_disable($format) { field_cache_clear(); } diff --git a/modules/field/modules/text/text.test b/modules/field/modules/text/text.test index 67aad26b0..9256277d9 100644 --- a/modules/field/modules/text/text.test +++ b/modules/field/modules/text/text.test @@ -163,11 +163,11 @@ class TextFieldTestCase extends DrupalWebTestCase { field_create_instance($this->instance); $langcode = LANGUAGE_NONE; - // Delete all text formats besides the plain text fallback format. + // Disable all text formats besides the plain text fallback format. $this->drupalLogin($this->admin_user); foreach (filter_formats() as $format) { if ($format->format != filter_fallback_format()) { - $this->drupalPost('admin/config/content/formats/' . $format->format . '/delete', array(), t('Delete')); + $this->drupalPost('admin/config/content/formats/' . $format->format . '/disable', array(), t('Disable')); } } $this->drupalLogin($this->web_user); |