MDL-36157 block_rss_client: Don't double escape titles.

This commit is contained in:
Luca Bösch
2018-03-06 00:20:40 +01:00
parent 3e74f4c3ce
commit 3b1041475e
+6 -2
View File
@@ -205,9 +205,11 @@
}
if(empty($feedrecord->preferredtitle)){
// Simplepie does escape HTML entities.
$feedtitle = $this->format_title($simplepiefeed->get_title());
}else{
$feedtitle = $this->format_title($feedrecord->preferredtitle);
// Moodle custom title does not does escape HTML entities.
$feedtitle = $this->format_title(s($feedrecord->preferredtitle));
}
if (empty($this->config->title)){
@@ -265,10 +267,12 @@
/**
* Strips a large title to size and adds ... if title too long
* This function does not escape HTML entities, so they have to be escaped
* before being passed here.
*
* @param string title to shorten
* @param int max character length of title
* @return string title s() quoted and shortened if necessary
* @return string title shortened if necessary
*/
function format_title($title,$max=64) {