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

Merge branch 'MDL-61359-35' of git://github.com/mickhawkins/moodle into MOODLE_35_STABLE

Browse source
This commit is contained in:
Jake Dallimore 2018-07-09 12:11:05 +08:00
commit 5136441985
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
message/amd/build/message_area_contacts.min.js vendored
View file

File diff suppressed because one or more lines are too long

6
message/amd/src/message_area_contacts.js
View file

@ -553,15 +553,13 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/cust
* @return {String} The altered text
*/
Contacts.prototype._getContactText = function(text) {
// Remove the HTML tags to render the contact text.
text = $(document.createElement('div')).html(text).text();
if (text.length > this._messageLength) {
text = text.substr(0, this._messageLength - 3);
text += '...';
}
return text;
// Text node prevents script injection through HTML entities.
return document.createTextNode(text);
};
/**