L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-64012 filters: activity name autolinking fails for names with ()

Browse Source
This commit is contained in:
Tim Hunt
2018-11-14 16:04:31 +00:00
parent dccda6546b
commit 0f98afefdf
3 changed files with 132 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/filterlib.php
+9 -2
View File
@@ -1278,7 +1278,7 @@ function filter_phrases($text, $linkarray, $ignoretagsopen = null, $ignoretagscl
// for things that have already been matched on this page.
static $usedphrases = [];
$ignoretags = array(); // To store all the enclosig tags to be completely ignored.
$ignoretags = array(); // To store all the enclosing tags to be completely ignored.
$tags = array(); // To store all the simple tags to be ignored.
if (!$linkarrayalreadyprepared) {
@@ -1418,8 +1418,15 @@ function filter_prepare_phrases_for_filtering(array $linkarray) {
// Quote any regular expression characters and the delimiter in the work phrase to be searched.
$linkobject->workregexp = preg_quote($linkobject->workregexp, '/');
// If we ony want to match entire words then add \b assertions. However, only
// do this if the first or last thing in the phrase to match is a word character.
if ($linkobject->fullmatch) {
$linkobject->workregexp = '\b' . $linkobject->workregexp . '\b';
if (preg_match('~^\w~', $linkobject->workregexp)) {
$linkobject->workregexp = '\b' . $linkobject->workregexp;
}
if (preg_match('~\w$~', $linkobject->workregexp)) {
$linkobject->workregexp = $linkobject->workregexp . '\b';
}
}
$linkobject->workregexp = '/(' . $linkobject->workregexp . ')/s';