mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-25 10:26:17 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-60337-master' of git://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2017-10-16 15:40:44 +08:00
commit ebb4244bf4
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/htmlpurifier/HTMLPurifier/AttrDef/URI/Host.php
View File

@ -97,7 +97,7 @@ class HTMLPurifier_AttrDef_URI_Host extends HTMLPurifier_AttrDef
// PHP 5.3 and later support this functionality natively
if (function_exists('idn_to_ascii')) {
$string = idn_to_ascii($string);
$string = idn_to_ascii($string, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
// If we have Net_IDNA2 support, we can support IRIs by
// punycoding them. (This is the most portable thing to do,

4
lib/htmlpurifier/readme_moodle.txt
View File

@ -13,3 +13,7 @@ Description of HTML Purifier v4.9.3 library import into Moodle
HTMLPurifier.path.php
* add locallib.php with Moodle specific extensions to /lib/htmlpurifier/
* add this readme_moodle.txt to /lib/htmlpurifier/
Modifications:
* MDL-60337 use correct IDN variant for converting domain names to ascii
Check status of https://github.com/ezyang/htmlpurifier/pull/148

24
lib/tests/htmlpurifier_test.php
View File

@ -319,6 +319,30 @@ class core_htmlpurifier_testcase extends basic_testcase {
$this->assertSame('<a>link</a>', purify_html($text));
}
/**
* Test non-ascii domain names
*/
public function test_idn() {
// Example of domain that gives the same result in IDNA2003 and IDNA2008 .
$text = '<a href="http://правительство.рф">правительство.рф</a>';
$expected = '<a href="http://xn--80aealotwbjpid2k.xn--p1ai">правительство.рф</a>';
$this->assertSame($expected, purify_html($text));
// Examples of deviations from http://www.unicode.org/reports/tr46/#Table_Deviation_Characters .
$text = '<a href="http://teßt.de">teßt.de</a>';
$expected = '<a href="http://xn--tet-6ka.de">teßt.de</a>';
$this->assertSame($expected, purify_html($text));
$text = '<a href="http://βόλος.com">http://βόλος.com</a>';
$expected = '<a href="http://xn--nxasmm1c.com">http://βόλος.com</a>';
$this->assertSame($expected, purify_html($text));
$text = '<a href="http://نامه‌ای.com">http://نامه‌ای.com</a>';
$expected = '<a href="http://xn--mgba3gch31f060k.com">http://نامه‌ای.com</a>';
$this->assertSame($expected, purify_html($text));
}
/**
* Tests media tags.
*