diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-06-27 13:55:36 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-06-27 13:55:36 +0000 |
| commit | 1dd4a65a532bd25e51b2be4df9d811c2ce8a2f40 (patch) | |
| tree | f7a174e95e7d37d35ab6eb2b8bf61526e2809c47 | |
| parent | 4a108fa6f8181d565b6e8c525b299e90ae80ffe5 (diff) | |
| download | elgg-1dd4a65a532bd25e51b2be4df9d811c2ce8a2f40.tar.gz elgg-1dd4a65a532bd25e51b2be4df9d811c2ce8a2f40.tar.bz2 | |
Closes #2307 #2308 - encoding ampersands in RSS links
git-svn-id: http://code.elgg.org/elgg/trunk@6572 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | views/default/page_elements/html_begin.php | 5 | ||||
| -rw-r--r-- | views/default/page_elements/owner_block.php | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/views/default/page_elements/html_begin.php b/views/default/page_elements/html_begin.php index 58c58833b..bd88cf218 100644 --- 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 53a7ea089..429683777 100644 --- 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> |