X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FFeed.php;h=35f2ce94385383952a80ef1bd93c8c9605a35899;hb=d965b71fbfa7a96f96341195da97d6467b5b61e7;hp=f76a634d3f0860af9428883781389fa9638bc81c;hpb=fb79f30319b9ad2a7eb0f5f4d1668143ec8f963e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Feed.php b/includes/Feed.php
index f76a634d3f..35f2ce9438 100644
--- a/includes/Feed.php
+++ b/includes/Feed.php
@@ -139,7 +139,7 @@ class FeedItem {
 	 */
 	public function getLanguage() {
 		global $wgLanguageCode;
-		return wfBCP47( $wgLanguageCode );
+		return LanguageCode::bcp47( $wgLanguageCode );
 	}
 
 	/**
@@ -230,6 +230,13 @@ abstract class ChannelFeed extends FeedItem {
 		$wgOut->disable();
 		$mimetype = $this->contentType();
 		header( "Content-type: $mimetype; charset=UTF-8" );
+
+		// Set a sane filename
+		$exts = MediaWiki\MediaWikiServices::getInstance()->getMimeAnalyzer()
+			->getExtensionsForType( $mimetype );
+		$ext = $exts ? strtok( $exts, ' ' ) : 'xml';
+		header( "Content-Disposition: inline; filename=\"feed.{$ext}\"" );
+
 		if ( $wgVaryOnXFP ) {
 			$wgOut->addVaryHeader( 'X-Forwarded-Proto' );
 		}