jenkins-bot has submitted this change and it was merged. Change subject: Empty attribute syntax ......................................................................
Empty attribute syntax * The value is implicitly the empty string. http://www.w3.org/TR/html5/syntax.html#syntax-attribute-name Bug: T54330 Change-Id: I8591ef209fb7337fb39ad6e45135942d074373bc --- M includes/Sanitizer.php M tests/parser/parserTests.txt 2 files changed, 19 insertions(+), 12 deletions(-) Approvals: Cscott: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php index 2340cd9..8422d9a 100644 --- a/includes/Sanitizer.php +++ b/includes/Sanitizer.php @@ -1276,9 +1276,10 @@ # Double-quoted return $set[3]; } elseif ( !isset( $set[2] ) ) { - # In XHTML, attributes must have a value. - # For 'reduced' form, return explicitly the attribute name here. - return $set[1]; + # In XHTML, attributes must have a value so return an empty string. + # See "Empty attribute syntax", + # http://www.w3.org/TR/html5/syntax.html#syntax-attribute-name + return ""; } else { throw new MWException( "Tag conditions not met. This should never happen and is a bug." ); } diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt index 18d9aa8..70c8c0c 100644 --- a/tests/parser/parserTests.txt +++ b/tests/parser/parserTests.txt @@ -7980,8 +7980,8 @@ <br title=bar/> <br title=bar/ > !! html/php -<p><br title="title" /> -<br title="title" /> +<p><br title="" /> +<br title="" /> <br /> <br title="bar" /> <br title="bar" /> @@ -14628,13 +14628,19 @@ </p> !! end +# Parsoid does not serialize to empty attribute syntax, +# so wt2wt and html2wt cases are skipped !! test -Attribute test: no value +Attribute test: no value (T54330) +!! options +parsoid=wt2html,html2html !! wikitext <font color>foo</font> -!! html -<p><font color="color">foo</font> +!! html/php +<p><font color="">foo</font> </p> +!! html/parsoid +<p><font color="">foo</font></p> !! end !! test @@ -15165,7 +15171,7 @@ 'width' => '200', 'height' => '100', 'depth' => '50', - 'square' => 'square', + 'square' => '', ) </pre> @@ -15213,7 +15219,7 @@ 'width' => '200', 'height' => '100', 'depth' => '50', - 'square' => 'square', + 'square' => '', ) </pre> <p>other stuff @@ -15360,7 +15366,7 @@ <link rel="stylesheet" itemprop="hello" href="{{SERVER}}"> </div> !! html -<div itemscope="itemscope"> +<div itemscope=""> <p> <meta itemprop="hello" content="world" /> <meta http-equiv="refresh" content="5"> <meta itemprop="hello" content="5" /> @@ -19279,7 +19285,7 @@ showindicators !! wikitext <indicator name="empty" /> -<indicator name></indicator> +<indicator name="name"></indicator> !! html empty= name= -- To view, visit https://gerrit.wikimedia.org/r/223346 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8591ef209fb7337fb39ad6e45135942d074373bc Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Arlolra <[email protected]> Gerrit-Reviewer: Arlolra <[email protected]> Gerrit-Reviewer: Cscott <[email protected]> Gerrit-Reviewer: Jackmcbarn <[email protected]> Gerrit-Reviewer: Subramanya Sastry <[email protected]> Gerrit-Reviewer: Tim Starling <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
