Index: modules/block/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.module,v
retrieving revision 1.427
diff -u -p -r1.427 block.module
--- modules/block/block.module	31 Jul 2010 12:54:58 -0000	1.427
+++ modules/block/block.module	20 Aug 2010 21:56:27 -0000
@@ -951,16 +951,6 @@ function block_user_role_delete($role) {
 }
 
 /**
- * Implements hook_filter_format_delete().
- */
-function block_filter_format_delete($format, $fallback) {
-  db_update('block_custom')
-    ->fields(array('format' => $fallback->format))
-    ->condition('format', $format->format)
-    ->execute();
-}
-
-/**
  * Implements hook_menu_delete().
  */
 function block_menu_delete($menu) {
Index: modules/filter/filter.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.admin.inc,v
retrieving revision 1.64
diff -u -p -r1.64 filter.admin.inc
--- modules/filter/filter.admin.inc	17 Aug 2010 13:50:52 -0000	1.64
+++ modules/filter/filter.admin.inc	20 Aug 2010 22:00:31 -0000
@@ -33,7 +33,6 @@ function filter_admin_overview($form) {
     }
     $form['formats'][$id]['roles'] = array('#markup' => $roles_markup);
     $form['formats'][$id]['configure'] = array('#type' => 'link', '#title' => t('configure'), '#href' => 'admin/config/content/formats/' . $id);
-    $form['formats'][$id]['delete'] = array('#type' => 'link', '#title' => t('delete'), '#href' => 'admin/config/content/formats/' . $id . '/delete', '#access' => !$form['formats'][$id]['#is_fallback']);
     $form['formats'][$id]['weight'] = array('#type' => 'weight', '#default_value' => $format->weight);
   }
   $form['actions'] = array('#type' => 'actions');
@@ -76,12 +75,11 @@ function theme_filter_admin_overview($va
         drupal_render($form['formats'][$id]['roles']),
         drupal_render($form['formats'][$id]['weight']),
         drupal_render($form['formats'][$id]['configure']),
-        drupal_render($form['formats'][$id]['delete']),
       ),
       'class' => array('draggable'),
     );
   }
-  $header = array(t('Name'), t('Roles'), t('Weight'), array('data' => t('Operations'), 'colspan' => 2));
+  $header = array(t('Name'), t('Roles'), t('Weight'), array('data' => t('Operations')));
   $output = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'text-format-order')));
   $output .= drupal_render_children($form);
 
@@ -313,45 +311,3 @@ function filter_admin_format_form_submit
   }
 }
 
-/**
- * Menu callback; confirm deletion of a format.
- *
- * @ingroup forms
- * @see filter_admin_delete_submit()
- */
-function filter_admin_delete($form, &$form_state, $format) {
-  $form['#format'] = $format;
-
-  $fallback_options = array();
-  foreach (filter_formats() as $id => $fallback_format) {
-    if ($id != $format->format) {
-      $fallback_options[$id] = $fallback_format->name;
-    }
-  }
-  $form['fallback'] = array(
-    '#type' => 'select',
-    '#title' => t('Replacement text format'),
-    '#options' => $fallback_options,
-    '#default_value' => filter_fallback_format(),
-    '#description' => t('Content assigned to the deleted text format will be reassigned to the chosen one.'),
-  );
-
-  return confirm_form($form,
-    t('Are you sure you want to delete the text format %format?', array('%format' => $format->name)),
-    'admin/config/content/formats',
-    NULL,
-    t('Delete')
-  );
-}
-
-/**
- * Process filter delete form submission.
- */
-function filter_admin_delete_submit($form, &$form_state) {
-  $format = $form['#format'];
-  filter_format_delete($format, $form_state['values']['fallback']);
-  drupal_set_message(t('Deleted text format %format.', array('%format' => $format->name)));
-
-  $form_state['redirect'] = 'admin/config/content/formats';
-}
-
Index: modules/filter/filter.api.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.api.php,v
retrieving revision 1.20
diff -u -p -r1.20 filter.api.php
--- modules/filter/filter.api.php	26 Jun 2010 01:55:29 -0000	1.20
+++ modules/filter/filter.api.php	20 Aug 2010 21:56:51 -0000
@@ -209,7 +209,6 @@ function hook_filter_info_alter(&$info) 
  *   The format object of the format being updated.
  *
  * @see hook_filter_format_update()
- * @see hook_filter_format_delete()
  */
 function hook_filter_format_insert($format) {
   mymodule_cache_rebuild();
@@ -226,36 +225,11 @@ function hook_filter_format_insert($form
  *   The format object of the format being updated.
  *
  * @see hook_filter_format_insert()
- * @see hook_filter_format_delete()
  */
 function hook_filter_format_update($format) {
   mymodule_cache_rebuild();
 }
 
 /**
- * Perform actions when a text format has been deleted.
- *
- * All modules storing references to text formats have to implement this hook.
- *
- * When a text format is deleted, all content that previously had that format
- * assigned needs to be switched to the passed fallback format.
- *
- * @param $format
- *   The format object of the format being deleted.
- * @param $fallback
- *   The format object of the format to use as replacement.
- *
- * @see hook_filter_format_insert()
- * @see hook_filter_format_update()
- */
-function hook_filter_format_delete($format, $fallback) {
-  // Replace the deleted format with the fallback format.
-  db_update('my_module_table')
-    ->fields(array('format' => $fallback->format))
-    ->condition('format', $format->format)
-    ->execute();
-}
-
-/**
  * @} End of "addtogroup hooks".
  */
Index: modules/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.339
diff -u -p -r1.339 filter.module
--- modules/filter/filter.module	20 Aug 2010 01:29:55 -0000	1.339
+++ modules/filter/filter.module	20 Aug 2010 21:58:52 -0000
@@ -122,33 +122,10 @@ function filter_menu() {
     'access arguments' => array('administer filters'),
     'file' => 'filter.admin.inc',
   );
-  $items['admin/config/content/formats/%filter_format/delete'] = array(
-    'title' => 'Delete text format',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('filter_admin_delete', 4),
-    'access callback' => '_filter_delete_format_access',
-    'access arguments' => array(4),
-    'type' => MENU_CALLBACK,
-    'file' => 'filter.admin.inc',
-  );
   return $items;
 }
 
 /**
- * Access callback for deleting text formats.
- *
- * @param $format
- *   A text format object.
- * @return
- *   TRUE if the text format can be deleted by the current user, FALSE
- *   otherwise.
- */
-function _filter_delete_format_access($format) {
-  // The fallback format can never be deleted.
-  return user_access('administer filters') && ($format->format != filter_fallback_format());
-}
-
-/**
  * Load a text format object from the database.
  *
  * @param $format_id
@@ -256,35 +233,6 @@ function filter_format_save(&$format) {
 }
 
 /**
- * Delete a text format.
- *
- * @param $format
- *   The text format object to be deleted.
- * @param $fallback_id
- *   (optional) The ID of the text format to use to reassign content that is
- *   currently using $format. If omitted, the currently stored
- *   filter_fallback_format() is used.
- */
-function filter_format_delete($format, $fallback_id = NULL) {
-  db_delete('filter_format')
-    ->condition('format', $format->format)
-    ->execute();
-  db_delete('filter')
-    ->condition('format', $format->format)
-    ->execute();
-
-  // Allow modules to react on text format deletion.
-  if (empty($fallback_id)) {
-    $fallback_id = filter_fallback_format();
-  }
-  $fallback = filter_format_load($fallback_id);
-  module_invoke_all('filter_format_delete', $format, $fallback);
-
-  filter_formats_reset();
-  cache_clear_all($format->format . ':', 'cache_filter', TRUE);
-}
-
-/**
  * Display a text format form title.
  */
 function filter_admin_format_title($format) {
@@ -502,7 +450,6 @@ function filter_default_format($account 
  * the fallback format's weight determines its placement with respect to the
  * user's other formats.
  *
- * @see hook_filter_format_delete()
  * @see filter_default_format()
  */
 function filter_fallback_format() {
Index: modules/filter/filter.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.test,v
retrieving revision 1.71
diff -u -p -r1.71 filter.test
--- modules/filter/filter.test	5 Aug 2010 23:53:38 -0000	1.71
+++ modules/filter/filter.test	20 Aug 2010 21:57:50 -0000
@@ -56,15 +56,6 @@ class FilterCRUDTestCase extends DrupalW
     filter_format_save($format);
     $this->verifyTextFormat($format);
     $this->verifyFilters($format);
-
-    // Delete the text format.
-    filter_format_delete($format);
-    $db_format = db_query("SELECT * FROM {filter_format} WHERE format = :format", array(':format' => $format->format))->fetchObject();
-    $this->assertFalse($db_format, t('Database: Deleted text format no longer exists.'));
-    $db_filters = db_query("SELECT * FROM {filter} WHERE format = :format", array(':format' => $format->format))->fetchObject();
-    $this->assertFalse($db_filters, t('Database: Filters for deleted text format no longer exist.'));
-    $formats = filter_formats();
-    $this->assertTrue(!isset($formats[$format->format]), t('filter_formats: Deleted text format no longer exists.'));
   }
 
   /**
@@ -529,15 +520,6 @@ class FilterFormatAccessTestCase extends
     $this->assertNoText($edit['title'], t('Old title not found.'));
     $this->assertText($new_edit['title'], t('New title found.'));
     $this->assertText($edit[$body_value_key], t('Old body found.'));
-
-    // Delete the Full HTML text format.
-    filter_format_delete($this->full_html_format);
-    $this->resetFilterCaches();
-
-    // Verify that body field can be edited and a new format can be selected.
-    $this->drupalGet('node/' . $node->nid . '/edit');
-    $this->assertNoFieldByXPath("//textarea[@name='$body_value_key' and @disabled='disabled']", NULL, t('Text format access denied message not found.'));
-    $this->assertFieldByXPath("//select[@name='$body_format_key']", NULL, t('Text format selector found.'));
   }
 
   /**
@@ -1306,19 +1288,6 @@ class FilterHooksTestCase extends Drupal
     // Verify the new block is in the database.
     $bid = db_query("SELECT bid FROM {block_custom} WHERE info = :info", array(':info' => $custom_block['info']))->fetchField();
     $this->assertNotNull($bid, t('New block found in database'));
-
-    // Delete the text format.
-    $this->drupalPost('admin/config/content/formats/' . $format_id . '/delete', array(), t('Delete'));
-    $this->assertRaw(t('Deleted text format %format.', array('%format' => $name)), t('Format successfully deleted.'));
-    $this->assertText('hook_filter_format_delete invoked.', t('hook_filter_format_delete() was invoked.'));
-
-    // Verify that the deleted format was replaced with the fallback format.
-    $current_format = db_select('block_custom', 'b')
-      ->fields('b', array('format'))
-      ->condition('bid', $bid)
-      ->execute()
-      ->fetchField();
-    $this->assertEqual($current_format, filter_fallback_format(), t('Deleted text format replaced with the fallback format.'));
   }
 }
 
Index: modules/simpletest/tests/filter_test.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/filter_test.module,v
retrieving revision 1.4
diff -u -p -r1.4 filter_test.module
--- modules/simpletest/tests/filter_test.module	4 Dec 2009 16:49:47 -0000	1.4
+++ modules/simpletest/tests/filter_test.module	20 Aug 2010 21:57:59 -0000
@@ -21,13 +21,6 @@ function filter_test_filter_format_updat
 }
 
 /**
- * Implements hook_filter_format_delete().
- */
-function filter_test_filter_format_delete($format, $default) {
-  drupal_set_message('hook_filter_format_delete invoked.');
-}
-
-/**
  * Implements hook_filter_info().
  */
 function filter_test_filter_info() {
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1193
diff -u -p -r1.1193 user.module
--- modules/user/user.module	15 Aug 2010 01:49:45 -0000	1.1193
+++ modules/user/user.module	20 Aug 2010 21:58:14 -0000
@@ -3611,16 +3611,6 @@ function user_modules_uninstalled($modul
 }
 
 /**
- * Implements hook_filter_format_delete().
- */
-function user_filter_format_delete($format, $fallback) {
-  db_update('users')
-    ->fields(array('signature_format' => $fallback->format))
-    ->condition('signature_format', $format->format)
-    ->execute();
-}
-
-/**
  * Helper function to rewrite the destination to avoid redirecting to login page after login.
  *
  * Third-party authentication modules may use this function to determine the