From d533ff3abe112d28686208e371f2fdc986e9c5e4 Mon Sep 17 00:00:00 2001 From: stronk7 Date: Sun, 7 Dec 2008 18:57:38 +0000 Subject: [PATCH] MDL-17545 activity names filter: Improve handling when name contains htmlentities() chars. Merged from 19_STABLE --- filter/activitynames/filter.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/filter/activitynames/filter.php b/filter/activitynames/filter.php index 9c2f866f36..7027a7d134 100644 --- a/filter/activitynames/filter.php +++ b/filter/activitynames/filter.php @@ -50,12 +50,14 @@ //Exclude labels, hidden activities and activities for group members only if ($activity->mod != "label" and $activity->visible and empty($activity->groupmembersonly)) { $title = s(trim(strip_tags(urldecode($activity->name)))); + $currentname = trim(urldecode($activity->name)); + $entitisedname = s($currentname); /// Avoid empty or unlinkable activity names if (!empty($title)) { $href_tag_begin = "wwwroot/mod/$activity->mod/view.php?id=$activity->cm\" $CFG->frametarget>"; - $currentname = urldecode($activity->name); - if ($currentname = trim($currentname)) { - $activitylist[] = new filterobject($currentname, $href_tag_begin, '', false, true); + $activitylist[] = new filterobject($currentname, $href_tag_begin, '', false, true); + if ($currentname != $entitisedname) { /// If name has some entity (& " < >) add that filter too. MDL-17545 + $activitylist[] = new filterobject($entitisedname, $href_tag_begin, '', false, true); } } } -- 2.39.5