MDL-28569 blocks/rss_client - RSS feed autodiscovery fails with ampersands

Simpliepie is quoting urls and we need the url to be unescaped

diff --git a/blocks/rss_client/editfeed.php b/blocks/rss_client/editfeed.php
index 38eeb48..5711917 100644 (file)
--- a/blocks/rss_client/editfeed.php
+++ b/blocks/rss_client/editfeed.php
@@ -140,7 +140,9 @@ class feed_edit_form extends moodleform {
                 return $url;
             }
 
-            return $rss->subscribe_url();
+            // return URL without quoting..
+            $discoveredurl = new moodle_url($rss->subscribe_url());
+            return $discoveredurl->out(false);
     }
 }