diff --git a/NEWS b/NEWS index a8d67fea..7398a75f 100644 --- a/NEWS +++ b/NEWS @@ -19,6 +19,8 @@ NEWS ( CHANGELOG and HISTORY ) HTMLPurifier - Fix improper removal of the contents of elements with only whitespace. Thanks Eric Wald for reporting. - Fix broken test suite in versions of PHP without spl_autoload_register() +- Fix degenerate case with YouTube filter involving double hyphens. + Thanks Pierre Attar for reporting. . Add verbose mode to command line test runner, use (--verbose) . Turn on unit tests for UnitConverter . Fix missing version number in configuration %Attr.DefaultImageAlt (added 3.2.0) diff --git a/library/HTMLPurifier/Filter/YouTube.php b/library/HTMLPurifier/Filter/YouTube.php index df20d09f..17c38d65 100644 --- a/library/HTMLPurifier/Filter/YouTube.php +++ b/library/HTMLPurifier/Filter/YouTube.php @@ -14,19 +14,27 @@ class HTMLPurifier_Filter_YouTube extends HTMLPurifier_Filter public function postFilter($html, $config, $context) { $post_regex = '#([A-Za-z0-9\-_]+)#'; - $post_replace = ''. - ''. + return preg_replace_callback($post_regex, array($this, 'postFilterCallback'), $html); + } + + protected function armorUrl($url) { + return str_replace('--', '--', $url); + } + + protected function postFilterCallback($matches) { + $url = $this->armorUrl($matches[1]); + return ''. + ''. ''. ''. ''; - return preg_replace($post_regex, $post_replace, $html); - } + } } // vim: et sw=4 sts=4 diff --git a/smoketests/preserveYouTube.php b/smoketests/preserveYouTube.php index cfa600a3..52f04a02 100644 --- a/smoketests/preserveYouTube.php +++ b/smoketests/preserveYouTube.php @@ -6,7 +6,7 @@ echo ''; ?> - + HTML Purifier Preserve YouTube Smoketest @@ -15,7 +15,7 @@ echo '';

HTML Purifier Preserve YouTube Smoketest

'; +$string = ''; $regular_purifier = new HTMLPurifier();