? d6.kpf
? fo.php
? patches
? test.php
? sites/all/cck
? sites/all/devel
? sites/all/modules
? sites/all/persistent_login
? sites/all/taxonomy_depth
? sites/all/views
? sites/default/files
? sites/default/settings.php
Index: modules/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.204.2.9
diff -u -F '^[fc]' -r1.204.2.9 filter.module
--- modules/filter/filter.module	10 Aug 2009 11:04:37 -0000	1.204.2.9
+++ modules/filter/filter.module	22 Feb 2010 19:36:35 -0000
@@ -377,9 +377,16 @@ function filter_list_format($format) {
   if (!isset($filters[$format])) {
     $result = db_query("SELECT * FROM {filters} WHERE format = %d ORDER BY weight, module, delta", $format);
     if (db_affected_rows($result) == 0 && !db_result(db_query("SELECT 1 FROM {filter_formats} WHERE format = %d", $format))) {
-      // The format has no filters and does not exist, use the default input
-      // format.
-      $filters[$format] = filter_list_format(variable_get('filter_default_format', 1));
+      // The format has no filters and does not exist. Use the default input
+      // format. Do not infinitely recurse if the default input format
+      // does not exist,
+      $default = variable_get('filter_default_format', 1);
+      if ($default != $format) {
+        $filters[$format] = filter_list_format($default);
+      }
+      else {
+        $filters[$format] = array();
+      }
     }
     else {
       $filters[$format] = array();