mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-06-02 14:15:11 +02:00
Code Issues Projects Releases Wiki Activity

MDL-60239 libraries: patch Markdown for PHP7.2

Browse Source
This commit is contained in:
Marina Glancy 2017-10-02 15:15:36 +08:00 committed by Andrew Nicols
parent 0b55f881f1
commit 2a1275479c
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/markdown/Markdown.php
View File

@ -1870,9 +1870,9 @@ class Markdown implements MarkdownInterface {
return;
}
$this->utf8_strlen = create_function('$text', 'return preg_match_all(
"/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/",
$text, $m);');
$this->utf8_strlen = function($text) {
return preg_match_all('/[\x00-\xBF]|[\xC0-\xFF][\x80-\xBF]*/', $text, $m);
};
}
/**

3
lib/markdown/readme_moodle.txt
View File

@ -5,6 +5,9 @@ Procedure:
* copy the classes and readme file to lib/markdown/* , Note .inc files need not be copied.
* update function markdown_to_html() in weblib.php if necessary,
note that we require the php files manually for performance reasons
* pull commits https://github.com/michelf/php-markdown/commit/0c1337a4d483b1e0b66bfdc3ffa644eafd40aa27
and https://github.com/michelf/php-markdown/commit/251ffcce7582d4b26936679e340abca973d55220
if they are not included in the next release (or remove this step)
* run phpunit tests
Petr Skoda

6
lib/tests/markdown_test.php
View File

@ -63,4 +63,10 @@ class core_markdown_testcase extends basic_testcase {
$result = "<p>some <a href=\"http://example.com/\">example link</a></p>\n";
$this->assertSame($result, markdown_to_html($text));
}
public function test_tabs() {
$text = "a\tbb\tccc\tя\tюэ\t水\tabcd\tabcde\tabcdef";
$result = "<p>a bb ccc я юэ 水 abcd abcde abcdef</p>\n";
$this->assertSame($result, markdown_to_html($text));
}
}