dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Introduce InterwikiLookupAdapter on top of SiteLookup"
[lhc/web/wiklou.git]
/
includes
/
Feed.php
diff --git
a/includes/Feed.php
b/includes/Feed.php
index
600b136
..
8bfe1c7
100644
(file)
--- a/
includes/Feed.php
+++ b/
includes/Feed.php
@@
-141,7
+141,7
@@
class FeedItem {
*/
public function getLanguage() {
global $wgLanguageCode;
*/
public function getLanguage() {
global $wgLanguageCode;
- return
$wgLanguageCode
;
+ return
wfBCP47( $wgLanguageCode )
;
}
/**
}
/**
@@
-248,12
+248,12
@@
abstract class ChannelFeed extends FeedItem {
global $wgRequest;
$ctype = $wgRequest->getVal( 'ctype', 'application/xml' );
global $wgRequest;
$ctype = $wgRequest->getVal( 'ctype', 'application/xml' );
- $allowedctypes =
array(
+ $allowedctypes =
[
'application/xml',
'text/xml',
'application/rss+xml',
'application/atom+xml'
'application/xml',
'text/xml',
'application/rss+xml',
'application/atom+xml'
-
)
;
+
]
;
return ( in_array( $ctype, $allowedctypes ) ? $ctype : 'application/xml' );
}
return ( in_array( $ctype, $allowedctypes ) ? $ctype : 'application/xml' );
}