diff options
| author | David Rothstein <drothstein@gmail.com> | 2016-02-01 18:37:58 -0500 |
|---|---|---|
| committer | David Rothstein <drothstein@gmail.com> | 2016-02-01 18:37:58 -0500 |
| commit | dbef1acd9520dee6c8ee71d7d0f0dd2129cba068 (patch) | |
| tree | 1d1a005ba0c1278752cad63f4291f5bf91f7a909 | |
| parent | f0d59102f528a9c66b1c3355bb6b2ee48f8b0282 (diff) | |
| download | brdo-dbef1acd9520dee6c8ee71d7d0f0dd2129cba068.tar.gz brdo-dbef1acd9520dee6c8ee71d7d0f0dd2129cba068.tar.bz2 | |
Issue #1946090 by pjonckiere, alex-mo, rpayanm: _drupal_wrap_mail_line() does not force-wrap too long words after 996 characters
| -rw-r--r-- | includes/mail.inc | 2 | ||||
| -rw-r--r-- | modules/simpletest/tests/mail.test | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/includes/mail.inc b/includes/mail.inc index 0275922be..0e5c17804 100644 --- a/includes/mail.inc +++ b/includes/mail.inc @@ -566,7 +566,7 @@ function _drupal_wrap_mail_line(&$line, $key, $values) { // Use soft-breaks only for purely quoted or unindented text. $line = wordwrap($line, 77 - $values['length'], $values['soft'] ? " \n" : "\n"); // Break really long words at the maximum width allowed. - $line = wordwrap($line, 996 - $values['length'], $values['soft'] ? " \n" : "\n"); + $line = wordwrap($line, 996 - $values['length'], $values['soft'] ? " \n" : "\n", TRUE); } /** diff --git a/modules/simpletest/tests/mail.test b/modules/simpletest/tests/mail.test index 70a43cb45..3e40e13a8 100644 --- a/modules/simpletest/tests/mail.test +++ b/modules/simpletest/tests/mail.test @@ -441,7 +441,7 @@ class DrupalHtmlToTextTestCase extends DrupalWebTestCase { * <CRLF> is 1000 characters." */ function testVeryLongLineWrap() { - $input = 'Drupal<br /><p>' . str_repeat('x', 2100) . '</><br />Drupal'; + $input = 'Drupal<br /><p>' . str_repeat('x', 2100) . '</p><br />Drupal'; $output = drupal_html_to_text($input); // This awkward construct comes from includes/mail.inc lines 8-13. $eol = variable_get('mail_line_endings', MAIL_LINE_ENDINGS); @@ -455,7 +455,6 @@ class DrupalHtmlToTextTestCase extends DrupalWebTestCase { $maximum_line_length = max($maximum_line_length, strlen($line . $eol)); } $verbose = 'Maximum line length found was ' . $maximum_line_length . ' octets.'; - // @todo This should assert that $maximum_line_length <= 1000. - $this->pass($verbose); + $this->assertTrue($maximum_line_length <= 1000, $verbose); } } |