MDL-23980 finally removed the sloppy urldecode() that was just a work…

…around for the regression in simplepie itself
ds125v · Aug 28, 2010 · 43ba7a5 · 43ba7a5
1 parent a762ba7
commit 43ba7a5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/blocks/rss_client/block_rss_client.php b/blocks/rss_client/block_rss_client.php
@@ -197,12 +197,12 @@ function get_feed_html($feedrecord, $maxentries, $showtitle){
 
         if ($this->config->block_rss_client_show_channel_link) {
 
-            $channellink = str_replace('&', '&amp;', $feed->get_link());
+            $channellink = $feed->get_link();
 
             if (!empty($channellink)){
                 //NOTE: this means the 'last feed' display wins the block title - but
                 //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 @@ function get_item_html($item){
 
         $r = html_writer::start_tag('li');
             $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');
 
             if($this->config->display_description && !empty($description)){