mirror of
https://github.com/ezyang/htmlpurifier.git
synced 2025-08-01 11:50:28 +02:00
[2.1.5] [MFH] Fix text-decoration: none bug
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/branches/php4@1800 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
1
NEWS
1
NEWS
@@ -31,6 +31,7 @@ ERRATA
|
|||||||
- Improved adherence to Unicode by checking for non-character codepoints.
|
- Improved adherence to Unicode by checking for non-character codepoints.
|
||||||
Thanks Geoffrey Sneddon for reporting. This may result in degraded
|
Thanks Geoffrey Sneddon for reporting. This may result in degraded
|
||||||
performance for extremely large inputs.
|
performance for extremely large inputs.
|
||||||
|
- Allow CSS property-value pair ''text-decoration: none''
|
||||||
. Added HTMLPurifier_UnitConverter and HTMLPurifier_Length for convenient
|
. Added HTMLPurifier_UnitConverter and HTMLPurifier_Length for convenient
|
||||||
handling of CSS-style lengths. HTMLPurifier_AttrDef_CSS_Length now uses
|
handling of CSS-style lengths. HTMLPurifier_AttrDef_CSS_Length now uses
|
||||||
this class.
|
this class.
|
||||||
|
@@ -15,10 +15,13 @@ class HTMLPurifier_AttrDef_CSS_TextDecoration extends HTMLPurifier_AttrDef
|
|||||||
static $allowed_values = array(
|
static $allowed_values = array(
|
||||||
'line-through' => true,
|
'line-through' => true,
|
||||||
'overline' => true,
|
'overline' => true,
|
||||||
'underline' => true
|
'underline' => true,
|
||||||
);
|
);
|
||||||
|
|
||||||
$string = strtolower($this->parseCDATA($string));
|
$string = strtolower($this->parseCDATA($string));
|
||||||
|
|
||||||
|
if ($string === 'none') return $string;
|
||||||
|
|
||||||
$parts = explode(' ', $string);
|
$parts = explode(' ', $string);
|
||||||
$final = '';
|
$final = '';
|
||||||
foreach ($parts as $part) {
|
foreach ($parts as $part) {
|
||||||
|
@@ -10,6 +10,9 @@ class HTMLPurifier_AttrDef_CSS_TextDecorationTest extends HTMLPurifier_AttrDefHa
|
|||||||
|
|
||||||
$this->def = new HTMLPurifier_AttrDef_CSS_TextDecoration();
|
$this->def = new HTMLPurifier_AttrDef_CSS_TextDecoration();
|
||||||
|
|
||||||
|
$this->assertDef('none');
|
||||||
|
$this->assertDef('none underline', 'underline');
|
||||||
|
|
||||||
$this->assertDef('underline');
|
$this->assertDef('underline');
|
||||||
$this->assertDef('overline');
|
$this->assertDef('overline');
|
||||||
$this->assertDef('line-through overline underline');
|
$this->assertDef('line-through overline underline');
|
||||||
|
Reference in New Issue
Block a user