diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-01-19 16:34:34 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-01-19 16:34:34 +0000 |
| commit | e47505081f2c1017a68f763e1170b44fddd1e722 (patch) | |
| tree | eb511a8d9bae266ed6cf86f789f270642af93e90 /modules/rss | |
| parent | 0a67b836a9b5021c91b9c327d3693991c3248dfc (diff) | |
| parent | 9384f987bb96d0d39787ff9d3d16a70c01cd76e0 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/rss')
| -rw-r--r-- | modules/rss/controllers/rss.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/modules/rss/controllers/rss.php b/modules/rss/controllers/rss.php index 41c781d9..3066ba16 100644 --- a/modules/rss/controllers/rss.php +++ b/modules/rss/controllers/rss.php @@ -52,14 +52,12 @@ class Rss_Controller extends Controller { $view->feed = $feed; $view->pub_date = date("D, d M Y H:i:s T"); - $feed->uri = url::abs_site(str_replace("&", "&", url::merge($_GET))); + $feed->uri = url::abs_site(url::merge($_GET)); if ($page > 1) { - $feed->previous_page_uri = - url::abs_site(str_replace("&", "&", url::merge(array("page" => $page - 1)))); + $feed->previous_page_uri = url::abs_site(url::merge(array("page" => $page - 1))); } if ($page < $feed->max_pages) { - $feed->next_page_uri = - url::abs_site(str_replace("&", "&", url::merge(array("page" => $page + 1)))); + $feed->next_page_uri = url::abs_site(url::merge(array("page" => $page + 1))); } header("Content-Type: application/rss+xml"); |