From: Chad Horohoe <demon@users.mediawiki.org>
Date: Sat, 14 Feb 2009 16:00:51 +0000 (+0000)
Subject: Cleanup to $wgFeedClasses:
X-Git-Tag: 1.31.0-rc.0~42892
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/bilan.php?a=commitdiff_plain;h=51ddf4f1df99f73828bbef20e39a7bfaae510236;p=lhc%2Fweb%2Fwiklou.git

Cleanup to $wgFeedClasses:
* Remove 2 unused globals
* (bug 17488) Link in toolbar to feeds should be localized (already have the feed-$format messages) Patch by Marcin Cieślak.
* Tangentially, can $wgFeedClasses be moved from Defines to DefaultSettings? Seems to make more sense in the latter.
---

diff --git a/CREDITS b/CREDITS
index 2c8f12af84..280654c6a3 100644
--- a/CREDITS
+++ b/CREDITS
@@ -67,6 +67,7 @@ following names for their contribution to the product.
 * Juliano F. Ravasi
 * Lucas Garczewski
 * Louperivois
+* Marcin Cieślak
 * Marooned
 * Max Semenik
 * Michael De La Rue
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9059596ce1..40693b0358 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -169,6 +169,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 12746) Do not allow new password e-mails when wiki is in read-only mode
 * (bug 17478) Fixed a PHP Strict standards error in
   maintenance/cleanupWatchlist.php
+* (bug 17488) RSS/Atom links in left toolbar are now localized
 
 == API changes in 1.15 ==
 * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions
diff --git a/includes/ChangesFeed.php b/includes/ChangesFeed.php
index 33a1f05f59..a0c2767a7a 100644
--- a/includes/ChangesFeed.php
+++ b/includes/ChangesFeed.php
@@ -20,7 +20,7 @@ class ChangesFeed {
 
 	public function execute( $feed, $rows, $limit=0, $hideminor=false, $lastmod=false, $target='' ) {
 		global $messageMemc, $wgFeedCacheTimeout;
-		global $wgFeedClasses, $wgSitename, $wgContLanguageCode;
+		global $wgSitename, $wgContLanguageCode;
 
 		if ( !FeedUtils::checkFeedOutput( $this->format ) ) {
 			return;
diff --git a/includes/Skin.php b/includes/Skin.php
index c6b40e9952..6cba23e92b 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1020,7 +1020,8 @@ END;
 		if( $wgOut->isSyndicated() ) {
 			foreach( $wgFeedClasses as $format => $class ) {
 				$feedurl = $wgRequest->escapeAppendQuery( "feed=$format" );
-				$s[] = "<a href=\"$feedurl\" rel=\"alternate\" type=\"application/{$format}+xml\" class=\"feedlink\">{$format}</a>";
+				$s[] = "<a href=\"$feedurl\" rel=\"alternate\" type=\"application/{$format}+xml\""
+						. " class=\"feedlink\">" . wfMsg( "feed-$format" ) . "</a>";
 			}
 		}
 		return $wgLang->pipeList( $s );
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 60b3eaa4a0..d2892e0ae5 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -138,7 +138,7 @@ class SkinTemplate extends Skin {
 		global $wgScript, $wgStylePath, $wgContLanguageCode;
 		global $wgMimeType, $wgJsMimeType, $wgOutputEncoding, $wgRequest;
 		global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces;
-		global $wgDisableCounters, $wgLogo, $action, $wgFeedClasses, $wgHideInterlanguageLinks;
+		global $wgDisableCounters, $wgLogo, $action, $wgHideInterlanguageLinks;
 		global $wgMaxCredits, $wgShowCreditsIfMax;
 		global $wgPageShowWatchingUsers;
 		global $wgUseTrackbacks, $wgUseSiteJs;