diff options
| -rw-r--r-- | modules/filter/filter.module | 7 | ||||
| -rw-r--r-- | modules/filter/filter.test | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/modules/filter/filter.module b/modules/filter/filter.module index 945a90518..58a3bf4ab 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -728,7 +728,12 @@ function _filter_html($text, $format) { $text = filter_xss($text, $allowed_tags); if (variable_get("filter_html_nofollow_$format", FALSE)) { - $text = preg_replace('/<a([^>]+)>/i', '<a\\1 rel="nofollow">', $text); + $html_dom = filter_dom_load($text); + $links = $html_dom->getElementsByTagName('a'); + foreach($links as $link) { + $link->setAttribute('rel', 'nofollow'); + } + $text = filter_dom_serialize($html_dom); } return trim($text); diff --git a/modules/filter/filter.test b/modules/filter/filter.test index 4f74a1ae3..f73be063f 100644 --- a/modules/filter/filter.test +++ b/modules/filter/filter.test @@ -475,6 +475,10 @@ class FilterUnitTest extends DrupalWebTestCase { $f = _filter_html('<!--[if true]><a href="http://www.example.com/">text</a><![endif]-->', 'f'); $this->assertNormalized($f, 'rel="nofollow"', t('Spam deterrent evasion -- link within a comment.')); + + $f = _filter_html('<a href="http://www.example.com/" rel="follow">text</a>', 'f'); + $this->assertNoNormalized($f, 'rel="follow"', t('Spam deterrent evasion -- with rel set - rel="follow" removed.')); + $this->assertNormalized($f, 'rel="nofollow"', t('Spam deterrent evasion -- with rel set - rel="nofollow" added.')); } /** |