diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-11-25 13:40:47 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-11-25 13:40:47 -0800 |
| commit | f50dbd992d6973caeaaa3139ddf5f908dd84ec79 (patch) | |
| tree | cbdb343de89306a4ed823dc5aa104a802f846dc4 /modules/rss/controllers/rss.php | |
| parent | 2e420522ece22942a9b3b6ee413ca0e1dfa76148 (diff) | |
| parent | dc67cf64813361b34c366123f37d88ef6988fcc8 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Conflicts:
modules/gallery/controllers/rest.php
Diffstat (limited to 'modules/rss/controllers/rss.php')
| -rw-r--r-- | modules/rss/controllers/rss.php | 2 |
1 files changed, 1 insertions, 1 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 |