diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-04 11:42:37 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-04 11:42:37 -0800 |
| commit | 8ca69cffbba70fe22e19478f742a37bdbd758d83 (patch) | |
| tree | 712a69eef7d134d7ad2ea2668d30fda44914beff /modules/rss | |
| parent | 5743b159c28888f2165cc4269d3302fea24fde7a (diff) | |
| parent | 5c107be9033ae48f781c8430702458f613e791ee (diff) | |
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules/rss')
| -rw-r--r-- | modules/rss/controllers/rss.php | 2 | ||||
| -rw-r--r-- | modules/rss/helpers/rss.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/rss/controllers/rss.php b/modules/rss/controllers/rss.php index 1ecec9af..ed2acef8 100644 --- a/modules/rss/controllers/rss.php +++ b/modules/rss/controllers/rss.php @@ -62,7 +62,7 @@ class Rss_Controller extends Controller { url::abs_site(str_replace("&", "&", url::merge(array("page" => $page + 1)))); } - rest::http_content_type(rest::RSS); + header("Content-Type: application/rss+xml"); print $view; } }
\ No newline at end of file diff --git a/modules/rss/helpers/rss.php b/modules/rss/helpers/rss.php index 81ff175f..4260206c 100644 --- a/modules/rss/helpers/rss.php +++ b/modules/rss/helpers/rss.php @@ -31,6 +31,6 @@ class rss_Core { */ static function feed_link($uri) { $url = url::site("rss/feed/$uri"); - return "<link rel=\"alternate\" type=\"" . rest::RSS . "\" href=\"$url\" />"; + return "<link rel=\"alternate\" type=\"application/rss+xml\" href=\"$url\" />"; } }
\ No newline at end of file |