Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev

Conflicts:
	modules/gallery/controllers/rest.php

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