diff --git "a/C:\\Documents and Settings\\kcraft\\Desktop\\Patches\\doc-cleanup-filter-module-1347914-7.patch" "b/C:\\Documents and Settings\\kcraft\\Desktop\\Patches\\doc-cleanup-filter-module-1347914-21.patch" index 61b3889..6f912a0 100644 --- "a/C:\\Documents and Settings\\kcraft\\Desktop\\Patches\\doc-cleanup-filter-module-1347914-7.patch" +++ "b/C:\\Documents and Settings\\kcraft\\Desktop\\Patches\\doc-cleanup-filter-module-1347914-21.patch" @@ -1,10 +1,9 @@ diff --git a/core/modules/filter/filter.admin.inc b/core/modules/filter/filter.admin.inc -index b4a7008..64d8e6d 100644 +index b4a7008..2b4e0a3 100644 --- a/core/modules/filter/filter.admin.inc +++ b/core/modules/filter/filter.admin.inc -@@ -1,15 +1,15 @@ - $data) { if (is_array($data) && isset($data['weight'])) { -@@ -95,7 +98,9 @@ function theme_filter_admin_overview($variables) { +@@ -95,7 +99,9 @@ function theme_filter_admin_overview($variables) { } /** @@ -43,7 +42,7 @@ index b4a7008..64d8e6d 100644 */ function filter_admin_format_page($format = NULL) { if (!isset($format->name)) { -@@ -109,11 +114,11 @@ function filter_admin_format_page($format = NULL) { +@@ -109,11 +115,11 @@ function filter_admin_format_page($format = NULL) { } /** @@ -57,7 +56,7 @@ index b4a7008..64d8e6d 100644 */ function filter_admin_format_form($form, &$form_state, $format) { $is_fallback = ($format->format == filter_fallback_format()); -@@ -287,7 +292,9 @@ function theme_filter_admin_format_filter_order($variables) { +@@ -287,7 +293,9 @@ function theme_filter_admin_format_filter_order($variables) { } /** @@ -68,7 +67,7 @@ index b4a7008..64d8e6d 100644 */ function filter_admin_format_form_validate($form, &$form_state) { $format_format = trim($form_state['values']['format']); -@@ -304,7 +311,9 @@ function filter_admin_format_form_validate($form, &$form_state) { +@@ -304,7 +312,9 @@ function filter_admin_format_form_validate($form, &$form_state) { } /** @@ -79,7 +78,7 @@ index b4a7008..64d8e6d 100644 */ function filter_admin_format_form_submit($form, &$form_state) { // Remove unnecessary values. -@@ -336,10 +345,11 @@ function filter_admin_format_form_submit($form, &$form_state) { +@@ -336,10 +346,11 @@ function filter_admin_format_form_submit($form, &$form_state) { } /** @@ -93,7 +92,7 @@ index b4a7008..64d8e6d 100644 */ function filter_admin_disable($form, &$form_state, $format) { $form['#format'] = $format; -@@ -353,7 +363,7 @@ function filter_admin_disable($form, &$form_state, $format) { +@@ -353,7 +364,7 @@ function filter_admin_disable($form, &$form_state, $format) { } /** @@ -116,16 +115,10 @@ 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..181a0ad 100644 +index 6675e4a..9f6300d 100644 --- a/core/modules/filter/filter.api.php +++ b/core/modules/filter/filter.api.php -@@ -1,5 +1,4 @@ - FALSE while developing, but be sure to remove that -@@ -56,8 +55,9 @@ +@@ -56,8 +56,9 @@ * - title: (required) An administrative summary of what the filter does. * - description: Additional administrative information about the filter's * behavior, if needed for clarification. @@ -180,7 +173,7 @@ index 6675e4a..181a0ad 100644 * - default settings: An associative array containing default settings for * the filter, to be applied when the filter has not been configured yet. * - prepare callback: The name of a function that escapes the content before -@@ -69,9 +69,9 @@ +@@ -69,9 +70,9 @@ * Note that setting this to FALSE makes the entire text format not * cacheable, which may have an impact on the site's overall performance. * See filter_format_allowcache() for details. @@ -193,7 +186,7 @@ index 6675e4a..181a0ad 100644 * - weight: A default weight for the filter in new text formats. * * @see filter_example.module -@@ -100,7 +100,7 @@ function hook_filter_info() { +@@ -100,7 +101,7 @@ function hook_filter_info() { } /** @@ -202,7 +195,7 @@ index 6675e4a..181a0ad 100644 * * @param $info * Array of information on filters exposed by hook_filter_info() -@@ -276,7 +276,7 @@ function hook_filter_FILTER_tips($filter, $format, $long) { +@@ -276,7 +277,7 @@ function hook_filter_FILTER_tips($filter, $format, $long) { */ /** @@ -211,7 +204,7 @@ index 6675e4a..181a0ad 100644 * * @param $format * The format object of the format being updated. -@@ -289,7 +289,7 @@ function hook_filter_format_insert($format) { +@@ -289,7 +290,7 @@ function hook_filter_format_insert($format) { } /** @@ -220,7 +213,7 @@ index 6675e4a..181a0ad 100644 * * 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 +306,7 @@ function hook_filter_format_update($format) { +@@ -306,7 +307,7 @@ function hook_filter_format_update($format) { } /** @@ -255,12 +248,11 @@ index c286159..4265387 100644 /** diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module -index 3b8942f..3818873 100644 +index 0747250..d4a1636 100644 --- a/core/modules/filter/filter.module +++ b/core/modules/filter/filter.module -@@ -1,8 +1,7 @@ - name = trim($format->name); -@@ -269,7 +275,7 @@ function filter_format_save($format) { +@@ -269,7 +276,7 @@ function filter_format_save($format) { } /** @@ -354,7 +346,7 @@ index 3b8942f..3818873 100644 * * There is no core facility to re-enable a disabled format. It is not deleted * to keep information for contrib and to make sure the format ID is never -@@ -311,7 +317,9 @@ function filter_format_exists($format_id) { +@@ -311,7 +318,9 @@ function filter_format_exists($format_id) { } /** @@ -365,7 +357,7 @@ index 3b8942f..3818873 100644 */ function filter_admin_format_title($format) { return $format->name; -@@ -348,6 +356,7 @@ function filter_permission() { +@@ -348,6 +357,7 @@ function filter_permission() { * * @param $format * An object representing a text format. @@ -373,7 +365,7 @@ index 3b8942f..3818873 100644 * @return * The machine-readable permission name, or FALSE if the provided text format * is malformed or is the fallback format (which is available to all users). -@@ -378,11 +387,12 @@ function filter_modules_disabled($modules) { +@@ -378,11 +388,12 @@ function filter_modules_disabled($modules) { } /** @@ -387,7 +379,7 @@ index 3b8942f..3818873 100644 * @return * An array of text format objects, keyed by the format ID and ordered by * weight. -@@ -425,7 +435,7 @@ function filter_formats($account = NULL) { +@@ -425,7 +436,7 @@ function filter_formats($account = NULL) { } /** @@ -396,7 +388,7 @@ index 3b8942f..3818873 100644 * * @see filter_formats() */ -@@ -441,6 +451,7 @@ function filter_formats_reset() { +@@ -441,6 +452,7 @@ function filter_formats_reset() { * * @param $format * An object representing the text format. @@ -404,7 +396,7 @@ index 3b8942f..3818873 100644 * @return * An array of role names, keyed by role ID. */ -@@ -459,6 +470,7 @@ function filter_get_roles_by_format($format) { +@@ -459,6 +471,7 @@ function filter_get_roles_by_format($format) { * * @param $rid * The user role ID to retrieve text formats for. @@ -412,7 +404,7 @@ index 3b8942f..3818873 100644 * @return * An array of text format objects that are allowed for the role, keyed by * the text format ID and ordered by weight. -@@ -493,6 +505,7 @@ function filter_get_formats_by_role($rid) { +@@ -493,6 +506,7 @@ function filter_get_formats_by_role($rid) { * @param $account * (optional) The user account to check. Defaults to the currently logged-in * user. @@ -420,7 +412,7 @@ index 3b8942f..3818873 100644 * @return * The ID of the user's default text format. * -@@ -533,6 +546,9 @@ function filter_default_format($account = NULL) { +@@ -533,6 +547,9 @@ function filter_default_format($account = NULL) { * Any modules implementing a format deletion functionality must not delete * this format. * @@ -430,7 +422,7 @@ index 3b8942f..3818873 100644 * @see hook_filter_format_disable() * @see filter_default_format() */ -@@ -555,7 +571,7 @@ function filter_fallback_format_title() { +@@ -555,7 +572,7 @@ function filter_fallback_format_title() { } /** @@ -439,7 +431,7 @@ index 3b8942f..3818873 100644 */ function filter_get_filters() { $filters = &drupal_static(__FUNCTION__, array()); -@@ -586,14 +602,16 @@ function filter_get_filters() { +@@ -586,14 +603,16 @@ function filter_get_filters() { } /** @@ -458,7 +450,7 @@ index 3b8942f..3818873 100644 * * This function can be used to check whether the result of the filtering * process can be cached. A text format may allow caching depending on the -@@ -601,6 +619,7 @@ function _filter_list_cmp($a, $b) { +@@ -601,6 +620,7 @@ function _filter_list_cmp($a, $b) { * * @param $format_id * The text format ID to check. @@ -466,7 +458,7 @@ index 3b8942f..3818873 100644 * @return * TRUE if the given text format allows caching, FALSE otherwise. */ -@@ -610,13 +629,14 @@ function filter_format_allowcache($format_id) { +@@ -610,13 +630,14 @@ function filter_format_allowcache($format_id) { } /** @@ -482,7 +474,7 @@ index 3b8942f..3818873 100644 * @return * TRUE if all the filters enabled in the given text format allow caching, * FALSE otherwise. -@@ -638,7 +658,7 @@ function _filter_format_is_cacheable($format) { +@@ -638,7 +659,7 @@ function _filter_format_is_cacheable($format) { } /** @@ -491,7 +483,7 @@ index 3b8942f..3818873 100644 * * Note that this function returns all associated filters regardless of whether * they are enabled or disabled. All functions working with the filter -@@ -692,7 +712,7 @@ function filter_list_format($format_id) { +@@ -692,7 +713,7 @@ function filter_list_format($format_id) { } /** @@ -500,7 +492,7 @@ index 3b8942f..3818873 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 -@@ -714,6 +734,9 @@ function filter_list_format($format_id) { +@@ -714,6 +735,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. * @@ -510,7 +502,7 @@ index 3b8942f..3818873 100644 * @ingroup sanitization */ function check_markup($text, $format_id = NULL, $langcode = '', $cache = FALSE) { -@@ -782,8 +805,8 @@ function check_markup($text, $format_id = NULL, $langcode = '', $cache = FALSE) +@@ -782,8 +806,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. * @@ -521,16 +513,23 @@ index 3b8942f..3818873 100644 * @code * $form_state['values']['body']['value'] = 'foo'; * $form_state['values']['body']['format'] = 'foo'; -@@ -931,7 +954,7 @@ function filter_process_format($element) { +@@ -931,11 +955,11 @@ function filter_process_format($element) { } /** - * #pre_render callback for #type 'text_format' to hide field value from prying eyes. -+ * #pre_render callback: Hide field value of 'text_format' elements. ++ * Render API callback: Hides the field value of 'text_format' elements. + * +- * To not break form processing and previews if a user does not have access to a +- * stored text format, the expanded form elements in filter_process_format() are +- * forced to take over the stored #default_values for 'value' and 'format'. ++ * To not break form processing and previews if a user does not have access to ++ * a stored text format, the expanded form elements in filter_process_format() ++ * are forced to take over the stored #default_values for 'value' and 'format'. + * However, to prevent the unfiltered, original #value from being displayed to + * the user, we replace it with a friendly notice here. * - * To not break form processing and previews if a user does not have access to a - * stored text format, the expanded form elements in filter_process_format() are -@@ -996,7 +1019,24 @@ function filter_access($format, $account = NULL) { +@@ -996,7 +1020,25 @@ function filter_access($format, $account = NULL) { } /** @@ -541,7 +540,8 @@ index 3b8942f..3818873 100644 + * The ID of the text format for which to retrieve tips, or -1 to return tips + * for all formats accessible to the current user. + * @param $long -+ * Boolean indicating whether the long form of tips should be returned. ++ * (optional) Boolean indicating whether the long form of tips should be ++ * returned. Defaults to FALSE. + * + * @return + * An array, keyed by text format name. For each format, the value is another @@ -556,7 +556,7 @@ index 3b8942f..3818873 100644 */ function _filter_tips($format_id, $long = FALSE) { global $user; -@@ -1030,14 +1070,14 @@ function _filter_tips($format_id, $long = FALSE) { +@@ -1030,14 +1072,14 @@ function _filter_tips($format_id, $long = FALSE) { /** * Parses an HTML snippet and returns it as a DOM object. * @@ -577,7 +577,7 @@ index 3b8942f..3818873 100644 * @return * A DOMDocument that represents the loaded (X)HTML snippet. */ -@@ -1052,15 +1092,16 @@ function filter_dom_load($text) { +@@ -1052,15 +1094,16 @@ function filter_dom_load($text) { /** * Converts a DOM object back to an HTML snippet. * @@ -598,7 +598,7 @@ index 3b8942f..3818873 100644 * @return * A valid (X)HTML snippet, as a string. */ -@@ -1123,7 +1164,7 @@ function filter_dom_serialize_escape_cdata_element($dom_document, $dom_element, +@@ -1123,7 +1166,7 @@ function filter_dom_serialize_escape_cdata_element($dom_document, $dom_element, } /** @@ -607,7 +607,7 @@ index 3b8942f..3818873 100644 * * @ingroup themeable */ -@@ -1132,7 +1173,7 @@ function theme_filter_tips_more_info() { +@@ -1132,7 +1175,7 @@ function theme_filter_tips_more_info() { } /** @@ -616,7 +616,7 @@ index 3b8942f..3818873 100644 * * @param $variables * An associative array containing: -@@ -1154,7 +1195,7 @@ function theme_filter_guidelines($variables) { +@@ -1154,7 +1197,7 @@ function theme_filter_guidelines($variables) { /** * @defgroup standard_filters Standard filters * @{ @@ -625,39 +625,87 @@ index 3b8942f..3818873 100644 */ /** -@@ -1247,7 +1288,7 @@ function _filter_html($text, $filter) { +@@ -1247,7 +1290,9 @@ function _filter_html($text, $filter) { } /** - * Filter tips callback for HTML filter. -+ * Filters the tips callback for the HTML filter. ++ * Filter tips callback: Provides help for the HTML filter. ++ * ++ * @see filter_filter_info() */ function _filter_html_tips($filter, $format, $long = FALSE) { global $base_url; -@@ -1345,7 +1386,7 @@ function _filter_html_tips($filter, $format, $long = FALSE) { +@@ -1345,7 +1390,9 @@ function _filter_html_tips($filter, $format, $long = FALSE) { } /** - * Settings callback for URL filter. -+ * Settings callback for the URL filter. ++ * Filter URL Settings callback: Provides settings for the URL filter. ++ * ++ * @see filter_filter_info() */ function _filter_url_settings($form, &$form_state, $filter, $format, $defaults) { $filter->settings += $defaults; -@@ -1525,7 +1566,7 @@ function _filter_url_parse_partial_links($match) { +@@ -1486,7 +1533,9 @@ function _filter_url($text, $filter) { + } + + /** +- * preg_replace callback to make links out of absolute URLs. ++ * Makes links out of absolute URLs. ++ * ++ * Callback for preg_replace_callback() within _filter_url(). + */ + function _filter_url_parse_full_links($match) { + // The $i:th parenthesis in the regexp contains the URL. +@@ -1499,7 +1548,9 @@ function _filter_url_parse_full_links($match) { + } + + /** +- * preg_replace callback to make links out of e-mail addresses. ++ * Makes links out of e-mail addresses. ++ * ++ * Callback for preg_replace_callback() within _filter_url(). + */ + function _filter_url_parse_email_links($match) { + // The $i:th parenthesis in the regexp contains the URL. +@@ -1512,7 +1563,9 @@ function _filter_url_parse_email_links($match) { + } + + /** +- * preg_replace callback to make links out of domain names starting with "www." ++ * Makes links out of domain names starting with "www." ++ * ++ * Callback for preg_replace_callback() within _filter_url(). + */ + function _filter_url_parse_partial_links($match) { + // The $i:th parenthesis in the regexp contains the URL. +@@ -1525,7 +1578,7 @@ function _filter_url_parse_partial_links($match) { } /** - * preg_replace callback to escape contents of HTML comments -+ * preg_replace callback to escape contents of HTML comments. ++ * Escapes the contents of HTML comments. * * @param $match * An array containing matches to replace from preg_replace_callback(), -@@ -1579,21 +1620,21 @@ function _filter_url_trim($text, $length = NULL) { +@@ -1533,6 +1586,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. ++ * ++ * Callback for preg_replace_callback() within _filter_url(). + */ + function _filter_url_escape_comments($match, $escape = NULL) { + static $mode, $comments = array(); +@@ -1579,21 +1634,23 @@ function _filter_url_trim($text, $length = NULL) { } /** - * Filter tips callback for URL filter. -+ * Filters the tips callback for the URL filter. ++ * Filter URL tips callback: Provides help for the URL filter. ++ * ++ * @see filter_filter_info() */ function _filter_url_tips($filter, $format, $long = FALSE) { return t('Web page addresses and e-mail addresses turn into links automatically.'); @@ -677,31 +725,34 @@ index 3b8942f..3818873 100644 * Based on: http://photomatt.net/scripts/autop */ function _filter_autop($text) { -@@ -1659,7 +1700,7 @@ function _filter_autop($text) { +@@ -1659,7 +1716,9 @@ function _filter_autop($text) { } /** - * Filter tips callback for auto-paragraph filter. -+ * Filters the tips callback for the auto-paragraph filter. ++ * Filter autop tips callback: Provides help for the auto-paragraph filter. ++ * ++ * @see filter_filter_info() */ function _filter_autop_tips($filter, $format, $long = FALSE) { if ($long) { -@@ -1678,7 +1719,7 @@ function _filter_html_escape($text) { +@@ -1678,7 +1737,9 @@ function _filter_html_escape($text) { } /** - * Filter tips callback for HTML escaping filter. -+ * Filters the tips callback for an HTML escaping filter. ++ * Filter HTML escape tips callback: Provides help for an HTML escaping filter. ++ * ++ * @see filter_filter_info() */ function _filter_html_escape_tips($filter, $format, $long = FALSE) { return t('No HTML tags allowed.'); diff --git a/core/modules/filter/filter.pages.inc b/core/modules/filter/filter.pages.inc -index dbbbe4c..73e9039 100644 +index dbbbe4c..db72e31 100644 --- a/core/modules/filter/filter.pages.inc +++ b/core/modules/filter/filter.pages.inc -@@ -1,13 +1,13 @@ - $format->name); -@@ -111,7 +110,7 @@ class FilterCRUDTestCase extends DrupalWebTestCase { +@@ -111,7 +111,7 @@ class FilterCRUDTestCase extends DrupalWebTestCase { } /** @@ -771,18 +821,17 @@ index 2bafd47..5c9f725 100644 */ function verifyFilters($format) { // Verify filter database records. -@@ -184,7 +183,9 @@ class FilterAdminTestCase extends DrupalWebTestCase { - $this->web_user = $this->drupalCreateUser(array('create page content', 'edit own page content')); +@@ -185,6 +185,9 @@ class FilterAdminTestCase extends DrupalWebTestCase { $this->drupalLogin($this->admin_user); } -- + + /** + * Tests the text format adminstration functionality. + */ function testFormatAdmin() { // Add text format. $this->drupalGet('admin/config/content/formats'); -@@ -249,7 +250,7 @@ class FilterAdminTestCase extends DrupalWebTestCase { +@@ -249,7 +252,7 @@ class FilterAdminTestCase extends DrupalWebTestCase { } /** @@ -791,7 +840,7 @@ index 2bafd47..5c9f725 100644 */ function testFilterAdmin() { // URL filter. -@@ -459,6 +460,9 @@ class FilterFormatAccessTestCase extends DrupalWebTestCase { +@@ -459,6 +462,9 @@ class FilterFormatAccessTestCase extends DrupalWebTestCase { )); } @@ -801,7 +850,7 @@ index 2bafd47..5c9f725 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. -@@ -495,6 +499,9 @@ class FilterFormatAccessTestCase extends DrupalWebTestCase { +@@ -495,6 +501,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.')); } @@ -811,7 +860,7 @@ index 2bafd47..5c9f725 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)); -@@ -516,7 +523,7 @@ class FilterFormatAccessTestCase extends DrupalWebTestCase { +@@ -516,7 +525,7 @@ class FilterFormatAccessTestCase extends DrupalWebTestCase { } /** @@ -820,7 +869,7 @@ index 2bafd47..5c9f725 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 -@@ -638,7 +645,7 @@ class FilterFormatAccessTestCase extends DrupalWebTestCase { +@@ -638,7 +647,7 @@ class FilterFormatAccessTestCase extends DrupalWebTestCase { } /** @@ -829,7 +878,7 @@ index 2bafd47..5c9f725 100644 */ protected function resetFilterCaches() { filter_formats_reset(); -@@ -655,6 +662,9 @@ class FilterDefaultFormatTestCase extends DrupalWebTestCase { +@@ -655,6 +664,9 @@ class FilterDefaultFormatTestCase extends DrupalWebTestCase { ); } @@ -839,7 +888,7 @@ index 2bafd47..5c9f725 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. -@@ -698,7 +708,7 @@ class FilterDefaultFormatTestCase extends DrupalWebTestCase { +@@ -698,7 +710,7 @@ class FilterDefaultFormatTestCase extends DrupalWebTestCase { } /** @@ -848,7 +897,7 @@ index 2bafd47..5c9f725 100644 */ protected function resetFilterCaches() { filter_formats_reset(); -@@ -715,6 +725,9 @@ class FilterNoFormatTestCase extends DrupalWebTestCase { +@@ -715,6 +727,9 @@ class FilterNoFormatTestCase extends DrupalWebTestCase { ); } @@ -858,7 +907,7 @@ index 2bafd47..5c9f725 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. -@@ -727,7 +740,7 @@ class FilterNoFormatTestCase extends DrupalWebTestCase { +@@ -727,7 +742,7 @@ class FilterNoFormatTestCase extends DrupalWebTestCase { } /** @@ -867,7 +916,7 @@ index 2bafd47..5c9f725 100644 */ class FilterSecurityTestCase extends DrupalWebTestCase { public static function getInfo() { -@@ -745,7 +758,7 @@ class FilterSecurityTestCase extends DrupalWebTestCase { +@@ -745,7 +760,7 @@ class FilterSecurityTestCase extends DrupalWebTestCase { } /** @@ -876,7 +925,7 @@ index 2bafd47..5c9f725 100644 */ function testDisableFilterModule() { // Create a new node. -@@ -776,7 +789,7 @@ class FilterSecurityTestCase extends DrupalWebTestCase { +@@ -776,7 +791,7 @@ class FilterSecurityTestCase extends DrupalWebTestCase { } /** @@ -885,7 +934,7 @@ index 2bafd47..5c9f725 100644 */ class FilterUnitTestCase extends DrupalUnitTestCase { public static function getInfo() { -@@ -788,7 +801,7 @@ class FilterUnitTestCase extends DrupalUnitTestCase { +@@ -788,7 +803,7 @@ class FilterUnitTestCase extends DrupalUnitTestCase { } /** @@ -894,16 +943,16 @@ index 2bafd47..5c9f725 100644 */ function testLineBreakFilter() { // Setup dummy filter object. -@@ -1048,7 +1061,7 @@ class FilterUnitTestCase extends DrupalUnitTestCase { +@@ -1048,7 +1063,7 @@ class FilterUnitTestCase extends DrupalUnitTestCase { } /** - * Test filter settings, defaults, access restrictions and similar. -+ * Tests filter settings, defaults, access restrictions, and similar things. ++ * Tests filter settings, defaults, access restrictions, etc. * * @todo This is for functions like filter_filter and check_markup, whose * functionality is not completely focused on filtering. Some ideas: -@@ -1104,7 +1117,7 @@ class FilterUnitTestCase extends DrupalUnitTestCase { +@@ -1104,7 +1119,7 @@ class FilterUnitTestCase extends DrupalUnitTestCase { } /** @@ -912,7 +961,7 @@ index 2bafd47..5c9f725 100644 */ function testNoFollowFilter() { // Setup dummy filter object. -@@ -1135,7 +1148,7 @@ class FilterUnitTestCase extends DrupalUnitTestCase { +@@ -1135,7 +1150,7 @@ class FilterUnitTestCase extends DrupalUnitTestCase { } /** @@ -921,7 +970,7 @@ index 2bafd47..5c9f725 100644 */ function testFilterXSSAdmin() { // DRUPAL-SA-2008-044 -@@ -1491,7 +1504,7 @@ www.example.com with a newline in comments --> +@@ -1491,7 +1506,7 @@ www.example.com with a newline in comments --> } /** @@ -930,7 +979,7 @@ index 2bafd47..5c9f725 100644 * * Filters based on regular expressions should also be tested with a more * complex content than just isolated test lines. -@@ -1522,7 +1535,7 @@ www.example.com with a newline in comments --> +@@ -1522,7 +1537,7 @@ www.example.com with a newline in comments --> } /** @@ -939,19 +988,16 @@ index 2bafd47..5c9f725 100644 * * @todo This test could really use some validity checking function. */ -@@ -1713,7 +1726,10 @@ body {color:red} +@@ -1713,7 +1728,7 @@ body {color:red} } /** - * Asserts that a text transformed to lowercase with HTML entities decoded does contains a given string. -+ * Asserts that a normalized string contains a given other string. -+ * -+ * Normalization here means transforming the string to lowercase and decoding -+ * HTML entities. ++ * Asserts that a lowercased, decoded HTML string contains another. * * Otherwise fails the test with a given message, similar to all the * SimpleTest assert* functions. -@@ -1729,6 +1745,7 @@ body {color:red} +@@ -1729,6 +1744,7 @@ body {color:red} * Message to display if failed. * @param $group * The group this message belongs to, defaults to 'Other'. @@ -959,19 +1005,16 @@ index 2bafd47..5c9f725 100644 * @return * TRUE on pass, FALSE on fail. */ -@@ -1737,7 +1754,10 @@ body {color:red} +@@ -1737,7 +1753,7 @@ body {color:red} } /** - * Asserts that text transformed to lowercase with HTML entities decoded does not contain a given string. -+ * Asserts that a normalized string does not contains a given other string. -+ * -+ * Normalization here means transforming the string to lowercase and decoding -+ * HTML entities. ++ * Asserts that a lowercased, decoded HTML string does not contain another. * * Otherwise fails the test with a given message, similar to all the * SimpleTest assert* functions. -@@ -1753,6 +1773,7 @@ body {color:red} +@@ -1753,6 +1769,7 @@ body {color:red} * Message to display if failed. * @param $group * The group this message belongs to, defaults to 'Other'. @@ -979,7 +1022,7 @@ index 2bafd47..5c9f725 100644 * @return * TRUE on pass, FALSE on fail. */ -@@ -1780,7 +1801,7 @@ class FilterHooksTestCase extends DrupalWebTestCase { +@@ -1780,7 +1797,7 @@ class FilterHooksTestCase extends DrupalWebTestCase { } /**