moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-39378' of git://github.com/timhunt/moodle

Browse source
This commit is contained in:
Dan Poltawski 2013-04-29 17:00:53 +01:00
commit a10393e19f
2 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lib/tests/weblib_test.php
View file

@ -70,8 +70,27 @@ class web_testcase extends advanced_testcase {
} }
function test_s() { function test_s() {
$this->assertEquals(s("This Breaks \" Strict"), "This Breaks " Strict"); // Special cases.
$this->assertEquals(s("This Breaks <a>\" Strict</a>"), "This Breaks &lt;a&gt;&quot; Strict&lt;/a&gt;"); $this->assertSame('0', s(0));
$this->assertSame('0', s('0'));
$this->assertSame('0', s(false));
$this->assertSame('', s(null));
// Normal cases.
$this->assertEquals('This Breaks &quot; Strict', s('This Breaks " Strict'));
$this->assertEquals('This Breaks &lt;a&gt;&quot; Strict&lt;/a&gt;', s('This Breaks <a>" Strict</a>'));
// Unicode characters.
$this->assertEquals('Café', s('Café'));
$this->assertEquals('一, 二, 三', s('一, 二, 三'));
// Don't escape already-escaped numeric entities. (Note, this behaviour
// may not be desirable. Perhaps we should remove these tests and that
// functionality, but we can only do that if we understand why it was added.)
$this->assertEquals('An entity: &#x09ff;.', s('An entity: &#x09ff;.'));
$this->assertEquals('An entity: &#1073;.', s('An entity: &#1073;.'));
$this->assertEquals('An entity: &amp;amp;.', s('An entity: &amp;.'));
$this->assertEquals('Not an entity: &amp;amp;#x09ff;.', s('Not an entity: &amp;#x09ff;.'));
} }
function test_format_text_email() { function test_format_text_email() {

12
lib/weblib.php
View file

@ -85,19 +85,19 @@ define('URL_MATCH_EXACT', 2);
* Returns $var with HTML characters (like "<", ">", etc.) properly quoted. * Returns $var with HTML characters (like "<", ">", etc.) properly quoted.
* This function is very similar to {@link p()} * This function is very similar to {@link p()}
* *
* @todo Remove obsolete param $obsolete if not used anywhere
*
* @param string $var the string potentially containing HTML characters * @param string $var the string potentially containing HTML characters
* @param boolean $obsolete no longer used.
* @return string * @return string
*/ */
function s($var, $obsolete = false) { function s($var) {
if ($var === '0' or $var === false or $var === 0) { if ($var === false) {
return '0'; return '0';
} }
return preg_replace("/&amp;#(\d+|x[0-7a-fA-F]+);/i", "&#$1;", htmlspecialchars($var, ENT_QUOTES, 'UTF-8', true)); // When we move to PHP 5.4 as a minimum version, change ENT_QUOTES on the
// next line to ENT_QUOTES | ENT_HTML5 | ENT_SUBSTITUTE, and remove the
// 'UTF-8' argument. Both bring a speed-increase.
return preg_replace('/&amp;#(\d+|x[0-9a-f]+);/i', '&#$1;', htmlspecialchars($var, ENT_QUOTES, 'UTF-8'));
} }
/** /**