diff options
| author | Gabriel Wicke <gwicke@users.mediawiki.org> | 2005-04-29 12:40:07 +0000 |
|---|---|---|
| committer | Gabriel Wicke <gwicke@users.mediawiki.org> | 2005-04-29 12:40:07 +0000 |
| commit | 8087dfc65791f60f20a34354632d7e78adedf6c1 (patch) | |
| tree | 894226f00201850c12990dcbe14035a48ee4b6de | |
| parent | f14bbfe55fe79b25d616ecedaa65f2f313b0db89 (diff) | |
| download | mediawikicore-8087dfc65791f60f20a34354632d7e78adedf6c1.tar.gz mediawikicore-8087dfc65791f60f20a34354632d7e78adedf6c1.zip | |
allow other content-types
Notes
Notes:
http://mediawiki.org/wiki/Special:Code/MediaWiki/8731
| -rw-r--r-- | includes/Feed.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/includes/Feed.php b/includes/Feed.php index e66032fd9e28..00e80b1e11a5 100644 --- a/includes/Feed.php +++ b/includes/Feed.php @@ -158,7 +158,10 @@ class ChannelFeed extends FeedItem { * @access private */ function contentType() { - return 'application/xml'; + global $wgRequest; + $ctype = $wgRequest->getVal('ctype','application/xml'); + $allowedctypes = array('application/xml','text/xml','application/rss+xml','application/atom+xml'); + return (in_array($ctype, $allowedctypes) ? $ctype : 'application/xml'); } /** |