diff --git "a/C:\\Documents and Settings\\kcraft\\Desktop\\Patches\\doc-cleanup-filter-module-1347914-35.patch" "b/C:\\Documents and Settings\\kcraft\\Desktop\\Patches\\doc-cleanup-filter-module-1347914-32.patch" index d0a54d0..0bdda04 100644 --- "a/C:\\Documents and Settings\\kcraft\\Desktop\\Patches\\doc-cleanup-filter-module-1347914-35.patch" +++ "b/C:\\Documents and Settings\\kcraft\\Desktop\\Patches\\doc-cleanup-filter-module-1347914-32.patch" @@ -1,5 +1,5 @@ diff --git a/core/modules/filter/filter.admin.inc b/core/modules/filter/filter.admin.inc -index 40a5eab..691cd71 100644 +index 40a5eab..80916ee 100644 --- a/core/modules/filter/filter.admin.inc +++ b/core/modules/filter/filter.admin.inc @@ -2,14 +2,15 @@ @@ -105,7 +105,7 @@ index 40a5eab..691cd71 100644 /** - * Process text format form submissions. -+ * Form submission handler for filter_admin_format_form(). ++ * Form submission hanlder for filter_admin_format_form(). + * + * @see filter_admin_format_form_validate() */ @@ -158,18 +158,9 @@ index 3bc6233..93b695a 100644 Drupal.behaviors.filterStatus = { diff --git a/core/modules/filter/filter.api.php b/core/modules/filter/filter.api.php -index 6675e4a..0fa36d7 100644 +index 6675e4a..f11a528 100644 --- a/core/modules/filter/filter.api.php +++ b/core/modules/filter/filter.api.php -@@ -11,7 +11,7 @@ - */ - - /** -- * Define content filters. -+ * Defines content filters. - * - * User submitted content is passed through a group of filters before it is - * output in HTML, in order to remove insecure or unwanted parts, correct or @@ -24,12 +24,12 @@ * input filters they provide. * @@ -229,69 +220,11 @@ index 6675e4a..0fa36d7 100644 * - weight: A default weight for the filter in new text formats. * * @see filter_example.module -@@ -100,7 +101,7 @@ function hook_filter_info() { - } - - /** -- * Perform alterations on filter definitions. -+ * Performs alterations on filter definitions. - * - * @param $info - * Array of information on filters exposed by hook_filter_info() -@@ -134,7 +135,7 @@ function hook_filter_info_alter(&$info) { - * module will take care of saving the settings in the database. - * - * If the filter's behavior depends on an extensive list and/or external data -- * (e.g. a list of smileys, a list of glossary terms), then the filter module -+ * (e.g. a list of smileys, a list of glossary terms), then the Filter module - * can choose to provide a separate, global configuration page rather than - * per-text-format settings. In that case, the settings callback function - * should provide a link to the separate settings page. -@@ -276,7 +277,7 @@ function hook_filter_FILTER_tips($filter, $format, $long) { - */ - - /** -- * Perform actions when a new text format has been created. -+ * Performs actions when a new text format has been created. - * - * @param $format - * The format object of the format being updated. -@@ -289,7 +290,7 @@ function hook_filter_format_insert($format) { - } - - /** -- * Perform actions when a text format has been updated. -+ * Performs actions when a text format has been updated. - * - * This hook allows modules to act when a text format has been updated in any - * way. For example, when filters have been reconfigured, disabled, or -@@ -306,7 +307,7 @@ function hook_filter_format_update($format) { - } - - /** -- * Perform actions when a text format has been disabled. -+ * Performs actions when a text format has been disabled. - * - * @param $format - * The format object of the format being disabled. -diff --git a/core/modules/filter/filter.install b/core/modules/filter/filter.install -index da9ecb8..3d7e1d7 100644 ---- a/core/modules/filter/filter.install -+++ b/core/modules/filter/filter.install -@@ -2,7 +2,7 @@ - - /** - * @file -- * Install, update and uninstall functions for the filter module. -+ * Install, update, and uninstall functions for the Filter module. - */ - - /** diff --git a/core/modules/filter/filter.js b/core/modules/filter/filter.js -index c286159..e21d289 100644 +index c286159..4265387 100644 --- a/core/modules/filter/filter.js +++ b/core/modules/filter/filter.js -@@ -1,7 +1,12 @@ +@@ -1,3 +1,8 @@ +/** + * @file + * Attaches behavior for the Filter module. @@ -300,13 +233,8 @@ index c286159..e21d289 100644 (function ($) { /** -- * Automatically display the guidelines of the selected text format. -+ * Displays the guidelines of the selected text format automatically. - */ - Drupal.behaviors.filterGuidelines = { - attach: function (context) { diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module -index 5fe4caa..a45385d 100644 +index 5fe4caa..3d84bef 100644 --- a/core/modules/filter/filter.module +++ b/core/modules/filter/filter.module @@ -2,7 +2,7 @@ @@ -384,7 +312,7 @@ index 5fe4caa..a45385d 100644 * one), or the filter is assigned a weight of 10, which will usually * put it at the bottom of the list. - * - 'status': (optional) A boolean indicating whether the filter is -+ * - status: (optional) A Boolean indicating whether the filter is ++ * - status: (optional) A boolean indicating whether the filter is * enabled in the text format. If omitted, the filter will be disabled. - * - 'settings': (optional) An array of configured settings for the filter. + * - settings: (optional) An array of configured settings for the filter. @@ -541,7 +469,7 @@ index 5fe4caa..a45385d 100644 * * Note that this function returns all associated filters regardless of whether * they are enabled or disabled. All functions working with the filter -@@ -694,13 +715,13 @@ function filter_list_format($format_id) { +@@ -694,7 +715,7 @@ function filter_list_format($format_id) { } /** @@ -550,14 +478,6 @@ index 5fe4caa..a45385d 100644 * * Note: Because filters can inject JavaScript or execute PHP code, security is * vital here. When a user supplies a text format, you should validate it using - * filter_access() before accepting/using it. This is normally done in the -- * validation stage of the Form API. You should for example never make a preview -- * of content in a disallowed format. -+ * validation stage of the Form API. You should for example never make a -+ * preview of content in a disallowed format. - * - * @param $text - * The text to be filtered. @@ -716,6 +737,9 @@ function filter_list_format($format_id) { * The caller may set this to FALSE when the output is already cached * elsewhere to avoid duplicate cache lookups and storage. @@ -568,33 +488,18 @@ index 5fe4caa..a45385d 100644 * @ingroup sanitization */ function check_markup($text, $format_id = NULL, $langcode = '', $cache = FALSE) { -@@ -777,15 +801,16 @@ function check_markup($text, $format_id = NULL, $langcode = '', $cache = FALSE) - * Expands an element into a base element with text format selector attached. +@@ -784,8 +808,8 @@ function check_markup($text, $format_id = NULL, $langcode = '', $cache = FALSE) + * the text format id specified in #format or the user's default format by + * default, if NULL. * - * The form element will be expanded into two separate form elements, one -- * holding the original element, and the other holding the text format selector: -- * - value: Holds the original element, having its #type changed to the value of -- * #base_type or 'textarea' by default. -- * - format: Holds the text format fieldset and the text format selection, using -- * the text format id specified in #format or the user's default format by -- * default, if NULL. -- * - * The resulting value for the element will be an array holding the value and the - * format. For example, the value for the body element will be: -+ * holding the original element, and the other holding the text format -+ * selector: -+ * - value: Holds the original element, having its #type changed to the value -+ * of #base_type or 'textarea' by default. -+ * - format: Holds the text format fieldset and the text format selection, -+ * using the text format id specified in #format or the user's default format -+ * by default, if NULL. -+ * + * The resulting value for the element will be an array holding the value and + * the format. For example, the value for the body element will be: * @code * $form_state['values']['body']['value'] = 'foo'; * $form_state['values']['body']['format'] = 'foo'; -@@ -933,11 +958,11 @@ function filter_process_format($element) { +@@ -933,11 +957,11 @@ function filter_process_format($element) { } /** @@ -610,7 +515,7 @@ index 5fe4caa..a45385d 100644 * However, to prevent the unfiltered, original #value from being displayed to * the user, we replace it with a friendly notice here. * -@@ -998,7 +1023,20 @@ function filter_access($format, $account = NULL) { +@@ -998,7 +1022,20 @@ function filter_access($format, $account = NULL) { } /** @@ -632,7 +537,7 @@ index 5fe4caa..a45385d 100644 */ function _filter_tips($format_id, $long = FALSE) { global $user; -@@ -1032,14 +1070,15 @@ function _filter_tips($format_id, $long = FALSE) { +@@ -1032,14 +1069,14 @@ function _filter_tips($format_id, $long = FALSE) { /** * Parses an HTML snippet and returns it as a DOM object. * @@ -640,32 +545,32 @@ index 5fe4caa..a45385d 100644 - * and returns a full DOMDocument object that represents this document. - * You can use filter_dom_serialize() to serialize this DOMDocument - * back to a XHTML snippet. -+ * This function loads the body part of a partial (X)HTML document and returns -+ * a full DOMDocument object that represents this document. You can use -+ * filter_dom_serialize() to serialize this DOMDocument back to a XHTML -+ * snippet. ++ * This function loads the body part of a partial (X)HTML document and returns a ++ * full DOMDocument object that represents this document. You can use ++ * filter_dom_serialize() to serialize this DOMDocument back to a XHTML snippet. * * @param $text - * The partial (X)HTML snippet to load. Invalid mark-up - * will be corrected on import. -+ * The partial (X)HTML snippet to load. Invalid markup will be corrected on ++ * The partial (X)HTML snippet to load. Invalid mark-up will be corrected on + * import. + * * @return * A DOMDocument that represents the loaded (X)HTML snippet. */ -@@ -1054,15 +1093,14 @@ function filter_dom_load($text) { +@@ -1054,15 +1091,16 @@ function filter_dom_load($text) { /** * Converts a DOM object back to an HTML snippet. * - * The function serializes the body part of a DOMDocument - * back to an XHTML snippet. -- * ++ * The function serializes the body part of a DOMDocument back to an XHTML ++ * snippet. + * - * The resulting XHTML snippet will be properly formatted - * to be compatible with HTML user agents. -+ * The function serializes the body part of a DOMDocument back to an XHTML -+ * snippet. The resulting XHTML snippet will be properly formatted to be -+ * compatible with HTML user agents. ++ * The resulting XHTML snippet will be properly formatted to be compatible with ++ * HTML user agents. * * @param $dom_document * A DOMDocument object to serialize, only the tags below @@ -701,39 +606,7 @@ index 5fe4caa..a45385d 100644 */ /** -@@ -1205,6 +1243,22 @@ function filter_filter_info() { - - /** - * Settings callback for the HTML filter. -+ * -+ * @param $filter -+ * The filter object containing the current settings for the given format, -+ * in $filter->settings. -+ * @param $format -+ * The format object being configured. -+ * @param $defaults -+ * The default settings for the filter, as defined in 'default settings' in -+ * hook_filter_info(). These should be combined with $filter->settings to -+ * define the form element defaults. -+ * -+ * @return -+ * An array of form elements defining settings for the filter. Array keys -+ * should match the array keys in $filter->settings and $defaults. -+ * -+ * @see hook_filter_FILTER_settings() - */ - function _filter_html_settings($form, &$form_state, $filter, $format, $defaults) { - $filter->settings += $defaults; -@@ -1230,7 +1284,7 @@ function _filter_html_settings($form, &$form_state, $filter, $format, $defaults) - } - - /** -- * HTML filter. Provides filtering of input into accepted HTML. -+ * Provides filtering of input into accepted HTML. - */ - function _filter_html($text, $filter) { - $allowed_tags = preg_split('/\s+|<|>/', $filter->settings['allowed_html'], -1, PREG_SPLIT_NO_EMPTY); -@@ -1249,7 +1303,9 @@ function _filter_html($text, $filter) { +@@ -1249,7 +1287,9 @@ function _filter_html($text, $filter) { } /** @@ -744,7 +617,7 @@ index 5fe4caa..a45385d 100644 */ function _filter_html_tips($filter, $format, $long = FALSE) { global $base_url; -@@ -1347,7 +1403,9 @@ function _filter_html_tips($filter, $format, $long = FALSE) { +@@ -1347,7 +1387,9 @@ function _filter_html_tips($filter, $format, $long = FALSE) { } /** @@ -755,23 +628,7 @@ index 5fe4caa..a45385d 100644 */ function _filter_url_settings($form, &$form_state, $filter, $format, $defaults) { $filter->settings += $defaults; -@@ -1365,12 +1423,13 @@ function _filter_url_settings($form, &$form_state, $filter, $format, $defaults) - } - - /** -- * URL filter. Automatically converts text into hyperlinks. -+ * Converts text into hyperlinks automatically. - * - * This filter identifies and makes clickable three types of "links". - * - URLs like http://example.com. - * - E-mail addresses like name@example.com. -- * - Web addresses without the "http://" protocol defined, like www.example.com. -+ * - Web addresses without the "http://" protocol defined, like -+ * www.example.com. - * Each type must be processed separately, as there is no one regular - * expression that could possibly match all of the cases in one pass. - */ -@@ -1488,7 +1547,9 @@ function _filter_url($text, $filter) { +@@ -1488,7 +1530,9 @@ function _filter_url($text, $filter) { } /** @@ -782,7 +639,7 @@ index 5fe4caa..a45385d 100644 */ function _filter_url_parse_full_links($match) { // The $i:th parenthesis in the regexp contains the URL. -@@ -1501,7 +1562,9 @@ function _filter_url_parse_full_links($match) { +@@ -1501,7 +1545,9 @@ function _filter_url_parse_full_links($match) { } /** @@ -793,7 +650,7 @@ index 5fe4caa..a45385d 100644 */ function _filter_url_parse_email_links($match) { // The $i:th parenthesis in the regexp contains the URL. -@@ -1514,7 +1577,9 @@ function _filter_url_parse_email_links($match) { +@@ -1514,7 +1560,9 @@ function _filter_url_parse_email_links($match) { } /** @@ -804,7 +661,7 @@ index 5fe4caa..a45385d 100644 */ function _filter_url_parse_partial_links($match) { // The $i:th parenthesis in the regexp contains the URL. -@@ -1527,7 +1592,7 @@ function _filter_url_parse_partial_links($match) { +@@ -1527,7 +1575,7 @@ function _filter_url_parse_partial_links($match) { } /** @@ -813,7 +670,7 @@ index 5fe4caa..a45385d 100644 * * @param $match * An array containing matches to replace from preg_replace_callback(), -@@ -1535,6 +1600,8 @@ function _filter_url_parse_partial_links($match) { +@@ -1535,6 +1583,8 @@ function _filter_url_parse_partial_links($match) { * @param $escape * (optional) Boolean whether to escape (TRUE) or unescape comments (FALSE). * Defaults to neither. If TRUE, statically cached $comments are reset. @@ -822,7 +679,7 @@ index 5fe4caa..a45385d 100644 */ function _filter_url_escape_comments($match, $escape = NULL) { static $mode, $comments = array(); -@@ -1581,21 +1648,24 @@ function _filter_url_trim($text, $length = NULL) { +@@ -1581,21 +1631,24 @@ function _filter_url_trim($text, $length = NULL) { } /** @@ -850,7 +707,7 @@ index 5fe4caa..a45385d 100644 * Based on: http://photomatt.net/scripts/autop */ function _filter_autop($text) { -@@ -1661,7 +1731,9 @@ function _filter_autop($text) { +@@ -1661,7 +1714,9 @@ function _filter_autop($text) { } /** @@ -861,7 +718,7 @@ index 5fe4caa..a45385d 100644 */ function _filter_autop_tips($filter, $format, $long = FALSE) { if ($long) { -@@ -1680,7 +1752,9 @@ function _filter_html_escape($text) { +@@ -1680,7 +1735,9 @@ function _filter_html_escape($text) { } /** @@ -902,7 +759,7 @@ index dbbbe4c..db72e31 100644 * Returns HTML for a set of filter tips. * diff --git a/core/modules/filter/filter.test b/core/modules/filter/filter.test -index 8226054..32ccd46 100644 +index 8226054..b98e7a0 100644 --- a/core/modules/filter/filter.test +++ b/core/modules/filter/filter.test @@ -2,11 +2,11 @@ @@ -946,17 +803,7 @@ index 8226054..32ccd46 100644 */ function verifyFilters($format) { // Verify filter database records. -@@ -160,6 +160,9 @@ class FilterCRUDTestCase extends DrupalWebTestCase { - } - } - -+/** -+ * Tests the format and filter administration functionality. -+ */ - class FilterAdminTestCase extends DrupalWebTestCase { - protected $profile = 'standard'; - -@@ -187,6 +190,9 @@ class FilterAdminTestCase extends DrupalWebTestCase { +@@ -187,6 +187,9 @@ class FilterAdminTestCase extends DrupalWebTestCase { $this->drupalLogin($this->admin_user); } @@ -966,7 +813,7 @@ index 8226054..32ccd46 100644 function testFormatAdmin() { // Add text format. $this->drupalGet('admin/config/content/formats'); -@@ -251,7 +257,7 @@ class FilterAdminTestCase extends DrupalWebTestCase { +@@ -251,7 +254,7 @@ class FilterAdminTestCase extends DrupalWebTestCase { } /** @@ -975,17 +822,7 @@ index 8226054..32ccd46 100644 */ function testFilterAdmin() { // URL filter. -@@ -403,6 +409,9 @@ class FilterAdminTestCase extends DrupalWebTestCase { - } - } - -+/** -+ * Tests the ability to access text formats. -+ */ - class FilterFormatAccessTestCase extends DrupalWebTestCase { - protected $admin_user; - protected $filter_admin_user; -@@ -463,6 +472,9 @@ class FilterFormatAccessTestCase extends DrupalWebTestCase { +@@ -463,6 +466,9 @@ class FilterFormatAccessTestCase extends DrupalWebTestCase { )); } @@ -995,7 +832,7 @@ index 8226054..32ccd46 100644 function testFormatPermissions() { // Make sure that a regular user only has access to the text format they // were granted access to, as well to the fallback format. -@@ -499,6 +511,9 @@ class FilterFormatAccessTestCase extends DrupalWebTestCase { +@@ -499,6 +505,9 @@ class FilterFormatAccessTestCase extends DrupalWebTestCase { $this->assertTrue(isset($options[filter_fallback_format()]), t('The fallback format appears as an option when adding a new node.')); } @@ -1005,7 +842,7 @@ index 8226054..32ccd46 100644 function testFormatRoles() { // Get the role ID assigned to the regular user; it must be the maximum. $rid = max(array_keys($this->web_user->roles)); -@@ -520,7 +535,7 @@ class FilterFormatAccessTestCase extends DrupalWebTestCase { +@@ -520,7 +529,7 @@ class FilterFormatAccessTestCase extends DrupalWebTestCase { } /** @@ -1014,7 +851,7 @@ index 8226054..32ccd46 100644 * * Verifies that regular users and administrators are able to edit a page, * but not allowed to change the fields which use an inaccessible text -@@ -642,7 +657,7 @@ class FilterFormatAccessTestCase extends DrupalWebTestCase { +@@ -642,7 +651,7 @@ class FilterFormatAccessTestCase extends DrupalWebTestCase { } /** @@ -1023,17 +860,7 @@ index 8226054..32ccd46 100644 */ protected function resetFilterCaches() { filter_formats_reset(); -@@ -650,6 +665,9 @@ class FilterFormatAccessTestCase extends DrupalWebTestCase { - } - } - -+/** -+ * Tests the default text formats for different users. -+ */ - class FilterDefaultFormatTestCase extends DrupalWebTestCase { - public static function getInfo() { - return array( -@@ -659,6 +677,9 @@ class FilterDefaultFormatTestCase extends DrupalWebTestCase { +@@ -659,6 +668,9 @@ class FilterDefaultFormatTestCase extends DrupalWebTestCase { ); } @@ -1043,7 +870,7 @@ index 8226054..32ccd46 100644 function testDefaultTextFormats() { // Create two text formats, and two users. The first user has access to // both formats, but the second user only has access to the second one. -@@ -702,7 +723,7 @@ class FilterDefaultFormatTestCase extends DrupalWebTestCase { +@@ -702,7 +714,7 @@ class FilterDefaultFormatTestCase extends DrupalWebTestCase { } /** @@ -1052,17 +879,7 @@ index 8226054..32ccd46 100644 */ protected function resetFilterCaches() { filter_formats_reset(); -@@ -710,6 +731,9 @@ class FilterDefaultFormatTestCase extends DrupalWebTestCase { - } - } - -+/** -+ * Tests for check_markup() when it is called without a text format. -+ */ - class FilterNoFormatTestCase extends DrupalWebTestCase { - public static function getInfo() { - return array( -@@ -719,6 +743,9 @@ class FilterNoFormatTestCase extends DrupalWebTestCase { +@@ -719,6 +731,9 @@ class FilterNoFormatTestCase extends DrupalWebTestCase { ); } @@ -1072,7 +889,7 @@ index 8226054..32ccd46 100644 function testCheckMarkupNoFormat() { // Create some text. Include some HTML and line breaks, so we get a good // test of the filtering that is applied to it. -@@ -731,7 +758,7 @@ class FilterNoFormatTestCase extends DrupalWebTestCase { +@@ -731,7 +746,7 @@ class FilterNoFormatTestCase extends DrupalWebTestCase { } /** @@ -1081,16 +898,16 @@ index 8226054..32ccd46 100644 */ class FilterSecurityTestCase extends DrupalWebTestCase { public static function getInfo() { -@@ -764,7 +791,7 @@ class FilterSecurityTestCase extends DrupalWebTestCase { +@@ -764,7 +779,7 @@ class FilterSecurityTestCase extends DrupalWebTestCase { } /** - * Test that filtered content is emptied when an actively used filter module is disabled. -+ * Tests whether filtered content is emptied when the module is disabled. ++ * Tests whehter filtered content is emptied when a the module is disabled. */ function testDisableFilterModule() { // Create a new node. -@@ -795,7 +822,7 @@ class FilterSecurityTestCase extends DrupalWebTestCase { +@@ -795,7 +810,7 @@ class FilterSecurityTestCase extends DrupalWebTestCase { } /** @@ -1099,7 +916,7 @@ index 8226054..32ccd46 100644 */ class FilterUnitTestCase extends DrupalUnitTestCase { public static function getInfo() { -@@ -807,7 +834,7 @@ class FilterUnitTestCase extends DrupalUnitTestCase { +@@ -807,7 +822,7 @@ class FilterUnitTestCase extends DrupalUnitTestCase { } /** @@ -1108,7 +925,7 @@ index 8226054..32ccd46 100644 */ function testLineBreakFilter() { // Setup dummy filter object. -@@ -1067,7 +1094,7 @@ class FilterUnitTestCase extends DrupalUnitTestCase { +@@ -1067,7 +1082,7 @@ class FilterUnitTestCase extends DrupalUnitTestCase { } /** @@ -1117,7 +934,7 @@ index 8226054..32ccd46 100644 * * @todo This is for functions like filter_filter and check_markup, whose * functionality is not completely focused on filtering. Some ideas: -@@ -1123,7 +1150,7 @@ class FilterUnitTestCase extends DrupalUnitTestCase { +@@ -1123,7 +1138,7 @@ class FilterUnitTestCase extends DrupalUnitTestCase { } /** @@ -1126,7 +943,7 @@ index 8226054..32ccd46 100644 */ function testNoFollowFilter() { // Setup dummy filter object. -@@ -1154,7 +1181,7 @@ class FilterUnitTestCase extends DrupalUnitTestCase { +@@ -1154,7 +1169,7 @@ class FilterUnitTestCase extends DrupalUnitTestCase { } /** @@ -1135,7 +952,7 @@ index 8226054..32ccd46 100644 */ function testFilterXSSAdmin() { // DRUPAL-SA-2008-044 -@@ -1510,7 +1537,7 @@ www.example.com with a newline in comments --> +@@ -1510,7 +1525,7 @@ www.example.com with a newline in comments --> } /** @@ -1144,7 +961,7 @@ index 8226054..32ccd46 100644 * * Filters based on regular expressions should also be tested with a more * complex content than just isolated test lines. -@@ -1541,7 +1568,7 @@ www.example.com with a newline in comments --> +@@ -1541,7 +1556,7 @@ www.example.com with a newline in comments --> } /** @@ -1153,7 +970,7 @@ index 8226054..32ccd46 100644 * * @todo This test could really use some validity checking function. */ -@@ -1732,7 +1759,7 @@ body {color:red} +@@ -1732,7 +1747,7 @@ body {color:red} } /** @@ -1162,7 +979,7 @@ index 8226054..32ccd46 100644 * * Otherwise fails the test with a given message, similar to all the * SimpleTest assert* functions. -@@ -1748,6 +1775,7 @@ body {color:red} +@@ -1748,6 +1763,7 @@ body {color:red} * Message to display if failed. * @param $group * The group this message belongs to, defaults to 'Other'. @@ -1170,7 +987,7 @@ index 8226054..32ccd46 100644 * @return * TRUE on pass, FALSE on fail. */ -@@ -1756,7 +1784,7 @@ body {color:red} +@@ -1756,7 +1772,7 @@ body {color:red} } /** @@ -1179,7 +996,7 @@ index 8226054..32ccd46 100644 * * Otherwise fails the test with a given message, similar to all the * SimpleTest assert* functions. -@@ -1772,6 +1800,7 @@ body {color:red} +@@ -1772,6 +1788,7 @@ body {color:red} * Message to display if failed. * @param $group * The group this message belongs to, defaults to 'Other'. @@ -1187,7 +1004,7 @@ index 8226054..32ccd46 100644 * @return * TRUE on pass, FALSE on fail. */ -@@ -1799,7 +1828,7 @@ class FilterHooksTestCase extends DrupalWebTestCase { +@@ -1799,7 +1816,7 @@ class FilterHooksTestCase extends DrupalWebTestCase { } /** @@ -1196,8 +1013,3 @@ index 8226054..32ccd46 100644 */ function testFilterHooks() { // Add a text format. -@@ -1900,4 +1929,3 @@ class FilterSettingsTestCase extends DrupalWebTestCase { - } - } - } --