diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-23 21:16:30 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-23 21:16:30 -0700 |
| commit | 18b402a1e55d9450eee79f2079fc91a8d856e26b (patch) | |
| tree | 792abb63fd7992b9d087e8d96348834c2dbb7316 /modules/rss/controllers | |
| parent | e5cf93c22a70ea30adc90aa71d274cc04a44114b (diff) | |
| parent | 5fb0434a478051f77ab241f62656ad941225c397 (diff) | |
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules/rss/controllers')
| -rw-r--r-- | modules/rss/controllers/rss.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/rss/controllers/rss.php b/modules/rss/controllers/rss.php index 015d6032..1ecec9af 100644 --- a/modules/rss/controllers/rss.php +++ b/modules/rss/controllers/rss.php @@ -52,12 +52,14 @@ 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(Router::$current_uri); + $feed->uri = url::abs_site(str_replace("&", "&", url::merge($_GET))); if ($page > 1) { - $feed->previous_page_uri = url::abs_site(url::merge(array("page" => $page - 1))); + $feed->previous_page_uri = + url::abs_site(str_replace("&", "&", url::merge(array("page" => $page - 1)))); } if ($page < $feed->max_pages) { - $feed->next_page_uri = url::abs_site(url::merge(array("page" => $page + 1))); + $feed->next_page_uri = + url::abs_site(str_replace("&", "&", url::merge(array("page" => $page + 1)))); } rest::http_content_type(rest::RSS); |