Closes #2307 #2308 - encoding ampersands in RSS links

git-svn-id: http://code.elgg.org/elgg/trunk@6572 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/views/default/page_elements/html_begin.php b/views/default/page_elements/html_begin.php
index 58c58833b04bfbd5e709cd845ad91087a1d3a829..bd88cf2183fd849559f88f64ac01f48e52922761 100644 (file)
--- a/views/default/page_elements/html_begin.php
+++ b/views/default/page_elements/html_begin.php
@@ -19,12 +19,13 @@ if (empty($vars['title'])) {
 
 global $autofeed;
 if (isset($autofeed) && $autofeed == true) {
-       $url = $url2 = full_url();
+       $url = full_url();
        if (substr_count($url,'?')) {
-               $url .= "&view=rss";
+               $url .= "&view=rss";
        } else {
                $url .= "?view=rss";
        }
+       $url = elgg_format_url($url);
        $feedref = <<<END
 
        <link rel="alternate" type="application/rss+xml" title="RSS" href="{$url}" />

diff --git a/views/default/page_elements/owner_block.php b/views/default/page_elements/owner_block.php
index 53a7ea0890f1fdc054e945261f4ac35c24bc0ad0..4296837778fe1005f39e87ddbc18bb3b2d855b12 100644 (file)
--- a/views/default/page_elements/owner_block.php
+++ b/views/default/page_elements/owner_block.php
@@ -15,12 +15,13 @@ $contents = "";
 // Are there feeds to display?
 global $autofeed;
 if (isset($autofeed) && $autofeed == true) {
-       $url = $url2 = full_url();
+       $url = full_url();
        if (substr_count($url,'?')) {
                $url .= "&view=rss";
        } else {
                $url .= "?view=rss";
        }
+       $url = elgg_format_url($url);
        $label = elgg_echo('feed:rss');
        $contents .= <<<END
        <div class="rss_link clearfloat"><a href="{$url}" rel="nofollow" title="{$label}">{$label}</a></div>