http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95178
Revision: 95178
Author: bawolff
Date: 2011-08-21 20:22:22 +0000 (Sun, 21 Aug 2011)
Log Message:
-----------
(follow-up r91812) change to wfMessage per Roan's suggestion.
I did do some testing, and this appears to work in the edge case of message in
user lang but not content.
Modified Paths:
--------------
trunk/extensions/GoogleNewsSitemap/GoogleNewsSitemap_body.php
Modified: trunk/extensions/GoogleNewsSitemap/GoogleNewsSitemap_body.php
===================================================================
--- trunk/extensions/GoogleNewsSitemap/GoogleNewsSitemap_body.php
2011-08-21 19:37:45 UTC (rev 95177)
+++ trunk/extensions/GoogleNewsSitemap/GoogleNewsSitemap_body.php
2011-08-21 20:22:22 UTC (rev 95178)
@@ -56,16 +56,17 @@
// Check to make sure that feed type is supported.
if ( FeedUtils::checkFeedOutput( $params['feed'] ) ) {
-
- if ( !wfEmptyMsg( 'feed-' . $params['feed'] ) ) {
+ $msg = wfMessage( 'feed-' . $params['feed']
)->inContentLanguage();
+ if ( $msg->exists() ) {
// This seems a little icky since
// its re-using another message in a
// different context.
// uses feed-rss and feed-atom messages.
- $feedType = wfMsgForContent( 'feed-' .
$params['feed'] );
+ $feedType = $msg->toString();
} else {
$feedType = $wgContLang->uc( $params['feed'] );
}
+
$feed = new $wgFeedClasses[ $params['feed'] ](
wfMsgExt( 'googlenewssitemap_feedtitle',
array( 'parsemag', 'content' ),
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
