? help-blocks-1.patch
? standalone-html-escape-1.patch
? standalone-html-escape.patch
? includes/password.inc
? includes/passwordhash.inc
? sites/default/files
? sites/default/settings.php
Index: modules/filter/filter.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.admin.inc,v
retrieving revision 1.10
diff -u -p -r1.10 filter.admin.inc
--- modules/filter/filter.admin.inc	19 Feb 2008 14:07:21 -0000	1.10
+++ modules/filter/filter.admin.inc	1 Apr 2008 04:34:43 -0000
@@ -144,7 +144,7 @@ function filter_admin_format_form(&$form
 
   $form['filters'] = array('#type' => 'fieldset',
     '#title' => t('Filters'),
-    '#description' => t('Choose the filters that will be used in this filter format.'),
+    '#description' => t('Select the filters to be enabled in this input format.'),
     '#tree' => TRUE,
   );
   foreach ($all as $id => $filter) {
@@ -164,7 +164,7 @@ function filter_admin_format_form(&$form
     if (!$tiplist) {
       $tiplist = '<p>'. t('No guidelines available.') .'</p>';
     }
-    $group = '<p>'. t('These are the guidelines that users will see for posting in this input format. They are automatically generated from the filter settings.') .'</p>';
+    $group = '<p>'. t('The following automatically-generated guidelines will be available to users posting in this input format.') .'</p>';
     $group .= $tiplist;
     $form['tips'] = array('#value' => '<h2>'. t('Formatting guidelines') .'</h2>'. $group);
   }
Index: modules/filter/filter.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.install,v
retrieving revision 1.7
diff -u -p -r1.7 filter.install
--- modules/filter/filter.install	15 Mar 2008 12:31:28 -0000	1.7
+++ modules/filter/filter.install	1 Apr 2008 04:34:43 -0000
@@ -106,3 +106,12 @@ function filter_update_7000() {
   db_add_field($ret, 'filter_formats', 'weight', array('type' => 'int', 'not null' => TRUE, 'default' => 0, 'size' => 'tiny'));
   return $ret;
 }
+
+/**
+ * Break out "escape HTML filter" option to its own filter.
+ */
+function filter_update_7001() {
+  $ret = array();
+  // @todo
+  return $ret;
+}
Index: modules/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.207
diff -u -p -r1.207 filter.module
--- modules/filter/filter.module	13 Mar 2008 21:26:08 -0000	1.207
+++ modules/filter/filter.module	1 Apr 2008 04:34:44 -0000
@@ -6,14 +6,14 @@
  * Framework for handling filtering of content.
  */
 
-// This is a special format ID which means "use the default format". This value
-// can be passed to the filter APIs as a format ID: this is equivalent to not
-// passing an explicit format at all.
+/**
+ * Special format ID which means "use the default format".
+ *
+ * This value can be passed to the filter APIs as a format ID: this is
+ * equivalent to not passing an explicit format at all.
+ */
 define('FILTER_FORMAT_DEFAULT', 0);
 
-define('FILTER_HTML_STRIP', 1);
-define('FILTER_HTML_ESCAPE', 2);
-
 /**
  * Implementation of hook_help().
  */
@@ -30,9 +30,9 @@ function filter_help($path, $arg) {
       $output .= '<p>'. t('Since input formats, if available, are presented in the same order as the list below, it may be helpful to arrange the formats in descending order of your preference for their use. To change the order of an input format, grab a drag-and-drop handle under the <em>Name</em> column and drag to a new location in the list. (Grab a handle by clicking and holding the mouse while hovering over a handle icon.) Remember that your changes will not be saved until you click the <em>Save changes</em> button at the bottom of the page.') .'</p>';
       return $output;
     case 'admin/settings/filters/%':
-      return '<p>'. t('Every <em>filter</em> performs one particular change on the user input, for example stripping out malicious HTML or making URLs clickable. Choose which filters you want to apply to text in this input format. If you notice some filters are causing conflicts in the output, you can <a href="@rearrange">rearrange them</a>.', array('@rearrange' => url('admin/settings/filters/'. $arg[3] .'/order'))) .'</p>';
+      return '<p>'. t('Use the page below to select the filters to be applied as part of this input format. Each enabled filter performs a specific operation, generally either adding, removing or transforming elements within user-entered text. One filter may strip potentially malicious HTML from user input, for instance, while another transforms URLs into clickable links. Filters are executed in a specific order and may be <a href="@rearrange">rearranged</a> to prevent conflicts in processing.', array('@rearrange' => url('admin/settings/filters/'. $arg[3] .'/order'))) .'</p>';
     case 'admin/settings/filters/%/configure':
-      return '<p>'. t('If you cannot find the settings for a certain filter, make sure you have enabled it on the <a href="@url">view tab</a> first.', array('@url' => url('admin/settings/filters/'. $arg[3]))) .'</p>';
+      return '<p>'. t('If the settings for a specific filter are not displayed, ensure the filter is enabled on the <a href="@url">edit page</a>.', array('@url' => url('admin/settings/filters/'. $arg[3]))) .'</p>';
     case 'admin/settings/filters/%/order':
       $output = '<p>'. t('Because of the flexible filtering system, you might encounter a situation where one filter prevents another from doing its job. For example: a word in an URL gets converted into a glossary term, before the URL can be converted to a clickable link. When this happens, rearrange the order of the filters.') .'</p>';
       $output .= '<p>'. t("Filters are executed from top-to-bottom. To change the order of the filters, modify the values in the <em>Weight</em> column or grab a drag-and-drop handle under the <em>Name</em> column and drag filters to new locations in the list. (Grab a handle by clicking and holding the mouse while hovering over a handle icon.) Remember that your changes will not be saved until you click the <em>Save configuration</em> button at the bottom of the page.") .'</p>';
@@ -171,100 +171,95 @@ function filter_filter_tips($delta, $for
   global $base_url;
   switch ($delta) {
     case 0:
-      if (variable_get("filter_html_$format", FILTER_HTML_STRIP) == FILTER_HTML_STRIP) {
-        if ($allowed_html = variable_get("allowed_html_$format", '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>')) {
-          switch ($long) {
-            case 0:
-              return t('Allowed HTML tags: @tags', array('@tags' => $allowed_html));
-            case 1:
-              $output = '<p>'. t('Allowed HTML tags: @tags', array('@tags' => $allowed_html)) .'</p>';
-              if (!variable_get("filter_html_help_$format", 1)) {
-                return $output;
-              }
+      if ($allowed_html = variable_get("allowed_html_$format", '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>')) {
+        switch ($long) {
+          case 0:
+            return t('Allowed HTML tags: @tags', array('@tags' => $allowed_html));
+          case 1:
+            $output = '<p>'. t('Allowed HTML tags: @tags', array('@tags' => $allowed_html)) .'</p>';
+            if (!variable_get("filter_html_help_$format", 1)) {
+              return $output;
+            }
 
-              $output .= '<p>'. t('This site allows HTML content. While learning all of HTML may feel intimidating, learning how to use a very small number of the most basic HTML "tags" is very easy. This table provides examples for each tag that is enabled on this site.') .'</p>';
-              $output .= '<p>'. t('For more information see W3C\'s <a href="@html-specifications">HTML Specifications</a> or use your favorite search engine to find other sites that explain HTML.', array('@html-specifications' => 'http://www.w3.org/TR/html/')) .'</p>';
-              $tips = array(
-                'a' => array( t('Anchors are used to make links to other pages.'), '<a href="'. $base_url .'">'. variable_get('site_name', 'Drupal') .'</a>'),
-                'br' => array( t('By default line break tags are automatically added, so use this tag to add additional ones. Use of this tag is different because it is not used with an open/close pair like all the others. Use the extra " /" inside the tag to maintain XHTML 1.0 compatibility'), t('Text with <br />line break')),
-                'p' => array( t('By default paragraph tags are automatically added, so use this tag to add additional ones.'), '<p>'. t('Paragraph one.') .'</p> <p>'. t('Paragraph two.') .'</p>'),
-                'strong' => array( t('Strong'), '<strong>'. t('Strong') .'</strong>'),
-                'em' => array( t('Emphasized'), '<em>'. t('Emphasized') .'</em>'),
-                'cite' => array( t('Cited'), '<cite>'. t('Cited') .'</cite>'),
-                'code' => array( t('Coded text used to show programming source code'), '<code>'. t('Coded') .'</code>'),
-                'b' => array( t('Bolded'), '<b>'. t('Bolded') .'</b>'),
-                'u' => array( t('Underlined'), '<u>'. t('Underlined') .'</u>'),
-                'i' => array( t('Italicized'), '<i>'. t('Italicized') .'</i>'),
-                'sup' => array( t('Superscripted'), t('<sup>Super</sup>scripted')),
-                'sub' => array( t('Subscripted'), t('<sub>Sub</sub>scripted')),
-                'pre' => array( t('Preformatted'), '<pre>'. t('Preformatted') .'</pre>'),
-                'abbr' => array( t('Abbreviation'), t('<abbr title="Abbreviation">Abbrev.</abbr>')),
-                'acronym' => array( t('Acronym'), t('<acronym title="Three-Letter Acronym">TLA</acronym>')),
-                'blockquote' => array( t('Block quoted'), '<blockquote>'. t('Block quoted') .'</blockquote>'),
-                'q' => array( t('Quoted inline'), '<q>'. t('Quoted inline') .'</q>'),
-                // Assumes and describes tr, td, th.
-                'table' => array( t('Table'), '<table> <tr><th>'. t('Table header') .'</th></tr> <tr><td>'. t('Table cell') .'</td></tr> </table>'),
-                'tr' => NULL, 'td' => NULL, 'th' => NULL,
-                'del' => array( t('Deleted'), '<del>'. t('Deleted') .'</del>'),
-                'ins' => array( t('Inserted'), '<ins>'. t('Inserted') .'</ins>'),
-                 // Assumes and describes li.
-                'ol' => array( t('Ordered list - use the &lt;li&gt; to begin each list item'), '<ol> <li>'. t('First item') .'</li> <li>'. t('Second item') .'</li> </ol>'),
-                'ul' => array( t('Unordered list - use the &lt;li&gt; to begin each list item'), '<ul> <li>'. t('First item') .'</li> <li>'. t('Second item') .'</li> </ul>'),
-                'li' => NULL,
-                // Assumes and describes dt and dd.
-                'dl' => array( t('Definition lists are similar to other HTML lists. &lt;dl&gt; begins the definition list, &lt;dt&gt; begins the definition term and &lt;dd&gt; begins the definition description.'), '<dl> <dt>'. t('First term') .'</dt> <dd>'. t('First definition') .'</dd> <dt>'. t('Second term') .'</dt> <dd>'. t('Second definition') .'</dd> </dl>'),
-                'dt' => NULL, 'dd' => NULL,
-                'h1' => array( t('Header'), '<h1>'. t('Title') .'</h1>'),
-                'h2' => array( t('Header'), '<h2>'. t('Subtitle') .'</h2>'),
-                'h3' => array( t('Header'), '<h3>'. t('Subtitle three') .'</h3>'),
-                'h4' => array( t('Header'), '<h4>'. t('Subtitle four') .'</h4>'),
-                'h5' => array( t('Header'), '<h5>'. t('Subtitle five') .'</h5>'),
-                'h6' => array( t('Header'), '<h6>'. t('Subtitle six') .'</h6>')
-              );
-              $header = array(t('Tag Description'), t('You Type'), t('You Get'));
-              preg_match_all('/<([a-z0-9]+)[^a-z0-9]/i', $allowed_html, $out);
-              foreach ($out[1] as $tag) {
-                if (array_key_exists($tag, $tips)) {
-                  if ($tips[$tag]) {
-                    $rows[] = array(
-                      array('data' => $tips[$tag][0], 'class' => 'description'),
-                      array('data' => '<code>'. check_plain($tips[$tag][1]) .'</code>', 'class' => 'type'),
-                      array('data' => $tips[$tag][1], 'class' => 'get')
-                    );
-                  }
-                }
-                else {
+            $output .= '<p>'. t('This site allows HTML content. While learning all of HTML may feel intimidating, learning how to use a very small number of the most basic HTML "tags" is very easy. This table provides examples for each tag that is enabled on this site.') .'</p>';
+            $output .= '<p>'. t('For more information see W3C\'s <a href="@html-specifications">HTML Specifications</a> or use your favorite search engine to find other sites that explain HTML.', array('@html-specifications' => 'http://www.w3.org/TR/html/')) .'</p>';
+            $tips = array(
+              'a' => array( t('Anchors are used to make links to other pages.'), '<a href="'. $base_url .'">'. variable_get('site_name', 'Drupal') .'</a>'),
+              'br' => array( t('By default line break tags are automatically added, so use this tag to add additional ones. Use of this tag is different because it is not used with an open/close pair like all the others. Use the extra " /" inside the tag to maintain XHTML 1.0 compatibility'), t('Text with <br />line break')),
+              'p' => array( t('By default paragraph tags are automatically added, so use this tag to add additional ones.'), '<p>'. t('Paragraph one.') .'</p> <p>'. t('Paragraph two.') .'</p>'),
+              'strong' => array( t('Strong'), '<strong>'. t('Strong') .'</strong>'),
+              'em' => array( t('Emphasized'), '<em>'. t('Emphasized') .'</em>'),
+              'cite' => array( t('Cited'), '<cite>'. t('Cited') .'</cite>'),
+              'code' => array( t('Coded text used to show programming source code'), '<code>'. t('Coded') .'</code>'),
+              'b' => array( t('Bolded'), '<b>'. t('Bolded') .'</b>'),
+              'u' => array( t('Underlined'), '<u>'. t('Underlined') .'</u>'),
+              'i' => array( t('Italicized'), '<i>'. t('Italicized') .'</i>'),
+              'sup' => array( t('Superscripted'), t('<sup>Super</sup>scripted')),
+              'sub' => array( t('Subscripted'), t('<sub>Sub</sub>scripted')),
+              'pre' => array( t('Preformatted'), '<pre>'. t('Preformatted') .'</pre>'),
+              'abbr' => array( t('Abbreviation'), t('<abbr title="Abbreviation">Abbrev.</abbr>')),
+              'acronym' => array( t('Acronym'), t('<acronym title="Three-Letter Acronym">TLA</acronym>')),
+              'blockquote' => array( t('Block quoted'), '<blockquote>'. t('Block quoted') .'</blockquote>'),
+              'q' => array( t('Quoted inline'), '<q>'. t('Quoted inline') .'</q>'),
+              // Assumes and describes tr, td, th.
+              'table' => array( t('Table'), '<table> <tr><th>'. t('Table header') .'</th></tr> <tr><td>'. t('Table cell') .'</td></tr> </table>'),
+              'tr' => NULL, 'td' => NULL, 'th' => NULL,
+              'del' => array( t('Deleted'), '<del>'. t('Deleted') .'</del>'),
+              'ins' => array( t('Inserted'), '<ins>'. t('Inserted') .'</ins>'),
+               // Assumes and describes li.
+              'ol' => array( t('Ordered list - use the &lt;li&gt; to begin each list item'), '<ol> <li>'. t('First item') .'</li> <li>'. t('Second item') .'</li> </ol>'),
+              'ul' => array( t('Unordered list - use the &lt;li&gt; to begin each list item'), '<ul> <li>'. t('First item') .'</li> <li>'. t('Second item') .'</li> </ul>'),
+              'li' => NULL,
+              // Assumes and describes dt and dd.
+              'dl' => array( t('Definition lists are similar to other HTML lists. &lt;dl&gt; begins the definition list, &lt;dt&gt; begins the definition term and &lt;dd&gt; begins the definition description.'), '<dl> <dt>'. t('First term') .'</dt> <dd>'. t('First definition') .'</dd> <dt>'. t('Second term') .'</dt> <dd>'. t('Second definition') .'</dd> </dl>'),
+              'dt' => NULL, 'dd' => NULL,
+              'h1' => array( t('Header'), '<h1>'. t('Title') .'</h1>'),
+              'h2' => array( t('Header'), '<h2>'. t('Subtitle') .'</h2>'),
+              'h3' => array( t('Header'), '<h3>'. t('Subtitle three') .'</h3>'),
+              'h4' => array( t('Header'), '<h4>'. t('Subtitle four') .'</h4>'),
+              'h5' => array( t('Header'), '<h5>'. t('Subtitle five') .'</h5>'),
+              'h6' => array( t('Header'), '<h6>'. t('Subtitle six') .'</h6>')
+            );
+            $header = array(t('Tag Description'), t('You Type'), t('You Get'));
+            preg_match_all('/<([a-z0-9]+)[^a-z0-9]/i', $allowed_html, $out);
+            foreach ($out[1] as $tag) {
+              if (array_key_exists($tag, $tips)) {
+                if ($tips[$tag]) {
                   $rows[] = array(
-                    array('data' => t('No help provided for tag %tag.', array('%tag' => $tag)), 'class' => 'description', 'colspan' => 3),
+                    array('data' => $tips[$tag][0], 'class' => 'description'),
+                    array('data' => '<code>'. check_plain($tips[$tag][1]) .'</code>', 'class' => 'type'),
+                    array('data' => $tips[$tag][1], 'class' => 'get')
                   );
                 }
               }
-              $output .= theme('table', $header, $rows);
-
-              $output .= '<p>'. t('Most unusual characters can be directly entered without any problems.') .'</p>';
-              $output .= '<p>'. t('If you do encounter problems, try using HTML character entities. A common example looks like &amp;amp; for an ampersand &amp; character. For a full list of entities see HTML\'s <a href="@html-entities">entities</a> page. Some of the available characters include:', array('@html-entities' => 'http://www.w3.org/TR/html4/sgml/entities.html')) .'</p>';
-
-              $entities = array(
-                array( t('Ampersand'), '&amp;'),
-                array( t('Greater than'), '&gt;'),
-                array( t('Less than'), '&lt;'),
-                array( t('Quotation mark'), '&quot;'),
-              );
-              $header = array(t('Character Description'), t('You Type'), t('You Get'));
-              unset($rows);
-              foreach ($entities as $entity) {
+              else {
                 $rows[] = array(
-                  array('data' => $entity[0], 'class' => 'description'),
-                  array('data' => '<code>'. check_plain($entity[1]) .'</code>', 'class' => 'type'),
-                  array('data' => $entity[1], 'class' => 'get')
+                  array('data' => t('No help provided for tag %tag.', array('%tag' => $tag)), 'class' => 'description', 'colspan' => 3),
                 );
               }
-              $output .= theme('table', $header, $rows);
-              return $output;
-          }
-        }
-        else {
-          return t('No HTML tags allowed');
+            }
+            $output .= theme('table', $header, $rows);
+
+            $output .= '<p>'. t('Most unusual characters can be directly entered without any problems.') .'</p>';
+            $output .= '<p>'. t('If you do encounter problems, try using HTML character entities. A common example looks like &amp;amp; for an ampersand &amp; character. For a full list of entities see HTML\'s <a href="@html-entities">entities</a> page. Some of the available characters include:', array('@html-entities' => 'http://www.w3.org/TR/html4/sgml/entities.html')) .'</p>';
+
+            $entities = array(
+              array( t('Ampersand'), '&amp;'),
+              array( t('Greater than'), '&gt;'),
+              array( t('Less than'), '&lt;'),
+              array( t('Quotation mark'), '&quot;'),
+            );
+            $header = array(t('Character Description'), t('You Type'), t('You Get'));
+            unset($rows);
+            foreach ($entities as $entity) {
+              $rows[] = array(
+                array('data' => $entity[0], 'class' => 'description'),
+                array('data' => '<code>'. check_plain($entity[1]) .'</code>', 'class' => 'type'),
+                array('data' => $entity[1], 'class' => 'get')
+              );
+            }
+            $output .= theme('table', $header, $rows);
+            return $output;
         }
       }
       break;
@@ -277,8 +272,15 @@ function filter_filter_tips($delta, $for
           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.');
       }
       break;
+
     case 2:
       return t('Web page addresses and e-mail addresses turn into links automatically.');
+      break;
+
+    case 4:
+      return t('No HTML tags allowed');
+      break;
+
   }
 }
 
@@ -602,18 +604,20 @@ function theme_filter_tips_more_info() {
 function filter_filter($op, $delta = 0, $format = -1, $text = '') {
   switch ($op) {
     case 'list':
-      return array(0 => t('HTML filter'), 1 => t('Line break converter'), 2 => t('URL filter'), 3 => t('HTML corrector'));
+      return array(0 => t('Limit allowed HTML tags'), 1 => t('Convert line breaks'), 2 => t('Convert URLs into links'), 3 => t('Correct broken HTML'), 4 => t('Escape all HTML'));
 
     case 'description':
       switch ($delta) {
         case 0:
-          return t('Allows you to restrict whether users can post HTML and which tags to filter out. It will also remove harmful content such as JavaScript events, JavaScript URLs and CSS styles from those tags that are not removed.');
+          return t('Limit HTML tags allowed within text (and remove potentially harmful JavaScript events, JavaScript URLs and CSS styles from all tags).');
         case 1:
-          return t('Converts line breaks into HTML (i.e. &lt;br&gt; and &lt;p&gt; tags).');
+          return t('Convert line breaks into HTML tags (i.e. &lt;br&gt; and &lt;p&gt;).');
         case 2:
-          return t('Turns web and e-mail addresses into clickable links.');
+          return t('Automatically transform web and e-mail addresses into clickable links.');
         case 3:
-          return t('Corrects faulty and chopped off HTML in postings.');
+          return t('Correct misformed or truncated HTML in content.');
+        case 4:
+          return t('Convert all HTML tags within text into display-only equivalents.');
         default:
           return;
       }
@@ -628,6 +632,8 @@ function filter_filter($op, $delta = 0, 
           return _filter_url($text, $format);
         case 3:
           return _filter_htmlcorrector($text);
+        case 4:
+          return trim(check_plain($text));
         default:
           return $text;
       }
@@ -656,32 +662,25 @@ function _filter_html_settings($format) 
     '#title' => t('HTML filter'),
     '#collapsible' => TRUE,
   );
-  $form['filter_html']["filter_html_$format"] = array(
-    '#type' => 'radios',
-    '#title' => t('Filter HTML tags'),
-    '#default_value' => variable_get("filter_html_$format", FILTER_HTML_STRIP),
-    '#options' => array(FILTER_HTML_STRIP => t('Strip disallowed tags'), FILTER_HTML_ESCAPE => t('Escape all tags')),
-    '#description' => t('How to deal with HTML tags in user-contributed content. If set to "Strip disallowed tags", dangerous tags are removed (see below). If set to "Escape tags", all HTML is escaped and presented as it was typed.'),
-  );
   $form['filter_html']["allowed_html_$format"] = array(
     '#type' => 'textfield',
     '#title' => t('Allowed HTML tags'),
     '#default_value' => variable_get("allowed_html_$format", '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>'),
     '#size' => 64,
     '#maxlength' => 255,
-    '#description' => t('If "Strip disallowed tags" is selected, optionally specify tags which should not be stripped. JavaScript event attributes are always stripped.'),
+    '#description' => t('If <em>Limit allowed HTML tags</em> is selected, optionally specify tags which should not be stripped. JavaScript event attributes are always stripped from all tags.'),
   );
   $form['filter_html']["filter_html_help_$format"] = array(
     '#type' => 'checkbox',
     '#title' => t('Display HTML help'),
     '#default_value' => variable_get("filter_html_help_$format", 1),
-    '#description' => t('If enabled, Drupal will display some basic HTML help in the long filter tips.'),
+    '#description' => t('If enabled, basic HTML help will be included on the <a href="@filter-tips">Compose tips page</a>.', array('@filter-tips' => url('filter/tips'))),
   );
   $form['filter_html']["filter_html_nofollow_$format"] = array(
     '#type' => 'checkbox',
     '#title' => t('Spam link deterrent'),
     '#default_value' => variable_get("filter_html_nofollow_$format", FALSE),
-    '#description' => t('If enabled, Drupal will add rel="nofollow" to all links, as a measure to reduce the effectiveness of spam links. Note: this will also prevent valid links from being followed by search engines, therefore it is likely most effective when enabled for anonymous users.'),
+    '#description' => t('If enabled, a <em>rel="nofollow"</em> will be added to all links, to reduce the effectiveness of link spam. Since enabling this option also prevent valid links from being followed by compliant search engines, you may wish to use it only with content entered by anonymous users.'),
   );
   return $form;
 }
@@ -690,15 +689,8 @@ function _filter_html_settings($format) 
  * HTML filter. Provides filtering of input into accepted HTML.
  */
 function _filter_html($text, $format) {
-  if (variable_get("filter_html_$format", FILTER_HTML_STRIP) == FILTER_HTML_STRIP) {
-    $allowed_tags = preg_split('/\s+|<|>/', variable_get("allowed_html_$format", '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>'), -1, PREG_SPLIT_NO_EMPTY);
-    $text = filter_xss($text, $allowed_tags);
-  }
-
-  if (variable_get("filter_html_$format", FILTER_HTML_STRIP) == FILTER_HTML_ESCAPE) {
-    // Escape HTML
-    $text = check_plain($text);
-  }
+  $allowed_tags = preg_split('/\s+|<|>/', variable_get("allowed_html_$format", '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>'), -1, PREG_SPLIT_NO_EMPTY);
+  $text = filter_xss($text, $allowed_tags);
 
   if (variable_get("filter_html_nofollow_$format", FALSE)) {
     $text = preg_replace('/<a([^>]+)>/i', '<a\\1 rel="nofollow">', $text);
@@ -721,7 +713,7 @@ function _filter_url_settings($format) {
     '#title' => t('Maximum link text length'),
     '#default_value' => variable_get('filter_url_length_'. $format, 72),
     '#maxlength' => 4,
-    '#description' => t('URLs longer than this number of characters will be truncated to prevent long strings that break formatting. The link itself will be retained; just the text portion of the link will be truncated.'),
+    '#description' => t('To prevent long strings from interfering with page formatting, URLs longer than this number of characters will be truncated. The link itself is retained; only the text portion of the link is shortened.'),
   );
   return $form;
 }