Index: modules/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.300
diff -u -p -r1.300 filter.module
--- modules/filter/filter.module	23 Oct 2009 22:24:14 -0000	1.300
+++ modules/filter/filter.module	21 Nov 2009 21:38:16 -0000
@@ -732,7 +732,9 @@ function _filter_tips($format_id, $long 
     foreach ($filters as $name => $filter) {
       if (isset($filter_info[$name]['tips callback']) && function_exists($filter_info[$name]['tips callback'])) {
         $tip = $filter_info[$name]['tips callback']($filter, $format, $long);
-        $tips[$format->name][$name] = array('tip' => $tip, 'id' => $name);
+        if ($tip) {
+          $tips[$format->name][$name] = array('tip' => $tip, 'id' => $name);
+        }
       }
     }
   }
@@ -914,8 +916,12 @@ function _filter_html($text, $filter) {
 function _filter_html_tips($filter, $format, $long = FALSE) {
   global $base_url;
 
-  if (!($allowed_html = $filter->settings['allowed_html'])) {
-    return;
+  if (!$filter->status || !($allowed_html = $filter->settings['allowed_html'])) {
+    $output = t('All HTML tags are allowed.');
+    if (!$long) {
+      return $output;
+    }
+    return '<p>' . $output . '</p>';
   }
   $output = t('Allowed HTML tags: @tags', array('@tags' => $allowed_html));
   if (!$long) {
@@ -1086,6 +1092,9 @@ function _filter_url_trim($text, $length
  * Filter tips callback for URL filter.
  */
 function _filter_url_tips($filter, $format, $long = FALSE) {
+  if (!$filter->status) {
+    return;
+  }
   return t('Web page addresses and e-mail addresses turn into links automatically.');
 }
 
@@ -1159,6 +1168,9 @@ function _filter_autop($text) {
  * Filter tips callback for auto-paragraph filter.
  */
 function _filter_autop_tips($filter, $format, $long = FALSE) {
+  if (!$filter->status) {
+    return;
+  }
   if ($long) {
     return t('Lines and paragraphs are automatically recognized. The &lt;br /&gt; line break, &lt;p&gt; paragraph and &lt;/p&gt; close paragraph tags are inserted automatically. If paragraphs are not recognized simply add a couple blank lines.');
   }
@@ -1178,7 +1190,9 @@ function _filter_html_escape($text) {
  * Filter tips callback for HTML escaping filter.
  */
 function _filter_html_escape_tips($filter, $format, $long = FALSE) {
-  return t('No HTML tags allowed.');
+  if ($filter->status) {
+    return t('No HTML tags allowed.');
+  }
 }
 
 /**