MDL-23980 finally removed the sloppy urldecode() that was just a workaround for the regression in simplepie itself

This commit is contained in:
Petr Skoda 2010-08-28 13:57:03 +00:00
parent a762ba7271
commit 43ba7a54c2

View file

@ -197,12 +197,12 @@
if ($this->config->block_rss_client_show_channel_link) { if ($this->config->block_rss_client_show_channel_link) {
$channellink = str_replace('&', '&', $feed->get_link()); $channellink = $feed->get_link();
if (!empty($channellink)){ if (!empty($channellink)){
//NOTE: this means the 'last feed' display wins the block title - but //NOTE: this means the 'last feed' display wins the block title - but
//this is exiting behaviour.. //this is exiting behaviour..
$this->content->footer = '<a href="'.clean_param(urldecode($channellink),PARAM_URL).'">'. get_string('clientchannellink', 'block_rss_client') .'</a>'; $this->content->footer = '<a href="'.htmlspecialchars(clean_param($channellink,PARAM_URL)).'">'. get_string('clientchannellink', 'block_rss_client') .'</a>';
} }
} }
@ -242,7 +242,7 @@
$r = html_writer::start_tag('li'); $r = html_writer::start_tag('li');
$r.= html_writer::start_tag('div',array('class'=>'link')); $r.= html_writer::start_tag('div',array('class'=>'link'));
$r.= html_writer::link(clean_param(urldecode($link),PARAM_URL), s($title), array('onclick'=>'this.target="_blank"')); $r.= html_writer::link(clean_param($link,PARAM_URL), s($title), array('onclick'=>'this.target="_blank"'));
$r.= html_writer::end_tag('div'); $r.= html_writer::end_tag('div');
if($this->config->display_description && !empty($description)){ if($this->config->display_description && !empty($description)){