| Index: trunk/extensions/GoogleNewsSitemap/GoogleNewsSitemap_body.php |
| — | — | @@ -56,16 +56,17 @@ |
| 57 | 57 | |
| 58 | 58 | // Check to make sure that feed type is supported. |
| 59 | 59 | if ( FeedUtils::checkFeedOutput( $params['feed'] ) ) { |
| 60 | | - |
| 61 | | - if ( !wfEmptyMsg( 'feed-' . $params['feed'] ) ) { |
| | 60 | + $msg = wfMessage( 'feed-' . $params['feed'] )->inContentLanguage(); |
| | 61 | + if ( $msg->exists() ) { |
| 62 | 62 | // This seems a little icky since |
| 63 | 63 | // its re-using another message in a |
| 64 | 64 | // different context. |
| 65 | 65 | // uses feed-rss and feed-atom messages. |
| 66 | | - $feedType = wfMsgForContent( 'feed-' . $params['feed'] ); |
| | 66 | + $feedType = $msg->toString(); |
| 67 | 67 | } else { |
| 68 | 68 | $feedType = $wgContLang->uc( $params['feed'] ); |
| 69 | 69 | } |
| | 70 | + |
| 70 | 71 | $feed = new $wgFeedClasses[ $params['feed'] ]( |
| 71 | 72 | wfMsgExt( 'googlenewssitemap_feedtitle', |
| 72 | 73 | array( 'parsemag', 'content' ), |