Browse Source

Handle invalid code sequences in Html::encode()

tags/2.0.0-rc
DaSourcerer 10 years ago
parent
commit
be164e45db
  1. 2
      framework/helpers/BaseHtml.php
  2. 2
      tests/unit/framework/helpers/HtmlTest.php

2
framework/helpers/BaseHtml.php

@ -92,7 +92,7 @@ class BaseHtml
*/
public static function encode($content, $doubleEncode = true)
{
return htmlspecialchars($content, ENT_QUOTES, Yii::$app->charset, $doubleEncode);
return htmlspecialchars($content, ENT_QUOTES | ENT_SUBSTITUTE, Yii::$app->charset, $doubleEncode);
}
/**

2
tests/unit/framework/helpers/HtmlTest.php

@ -38,7 +38,7 @@ class HtmlTest extends TestCase
public function testEncode()
{
$this->assertEquals("a&lt;&gt;&amp;&quot;&#039;", Html::encode("a<>&\"'"));
$this->assertEquals("a&lt;&gt;&amp;&quot;&#039;<EFBFBD>", Html::encode("a<>&\"'\x80"));
}
public function testDecode()

Loading…
Cancel
Save