misc generated feed tweaks (fix json content-type, etc)

12 years ago · 10bdeb4b82
parent ca3bca990d
commit 10bdeb4b82
1 changed files with 7 additions and 4 deletions
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@ -106,7 +106,11 @@ class Handler_Public extends Handler {
 			$tpl->addBlock('feed');
 			$tpl->generateOutputToString($tmp);

+			if (@!$_REQUEST["noxml"]) {
 				header("Content-Type: text/xml; charset=utf-8");
+			} else {
+				header("Content-Type: text/plain; charset=utf-8");
+			}

 			print $tmp;
 		} else if ($format == 'json') {
@ -165,8 +169,7 @@ class Handler_Public extends Handler {
 				array_push($feed['articles'], $article);
 			}

-			header("Content-Type: text/plain; charset=utf-8");
-
+			header("Content-Type: text/json; charset=utf-8");
 			print json_encode($feed);

 		} else {