From 51ddf4f1df99f73828bbef20e39a7bfaae510236 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Sat, 14 Feb 2009 16:00:51 +0000 Subject: [PATCH] =?utf8?q?Cleanup=20to=20$wgFeedClasses:=20*=20Remove=202?= =?utf8?q?=20unused=20globals=20*=20(bug=2017488)=20Link=20in=20toolbar=20?= =?utf8?q?to=20feeds=20should=20be=20localized=20(already=20have=20the=20f?= =?utf8?q?eed-$format=20messages)=20Patch=20by=20Marcin=20Cie=C5=9Blak.=20?= =?utf8?q?*=20Tangentially,=20can=20$wgFeedClasses=20be=20moved=20from=20D?= =?utf8?q?efines=20to=20DefaultSettings=3F=20Seems=20to=20make=20more=20se?= =?utf8?q?nse=20in=20the=20latter.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- CREDITS | 1 + RELEASE-NOTES | 1 + includes/ChangesFeed.php | 2 +- includes/Skin.php | 3 ++- includes/SkinTemplate.php | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) 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[] = "{$format}"; + $s[] = "" . wfMsg( "feed-$format" ) . ""; } } 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; -- 2.20.1