Index: modules/filter/filter.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.admin.inc,v
retrieving revision 1.69
diff -u -p -r1.69 filter.admin.inc
--- modules/filter/filter.admin.inc	22 Oct 2010 16:36:14 -0000	1.69
+++ modules/filter/filter.admin.inc	4 Nov 2010 23:15:36 -0000
@@ -295,7 +295,11 @@ function filter_admin_format_form_valida
   form_set_value($form['format'], $format_format, $form_state);
   form_set_value($form['name'], $format_name, $form_state);
 
-  $result = db_query("SELECT format FROM {filter_format} WHERE name = :name AND format <> :format", array(':name' => $format_name, ':format' => $format_format))->fetchField();
+  $result = db_query('SELECT format FROM {filter_format} WHERE name = :name AND format <> :format AND status = :status', array(
+    ':name' => $format_name,
+    ':format' => $format_format,
+    ':status' => 1,
+  ))->fetchField();
   if ($result) {
     form_set_error('name', t('Text format names must be unique. A format named %name already exists.', array('%name' => $format_name)));
   }