Followup to r47269 "* (bug 17488) Link in toolbar to feeds should be localized (alrea...

* Fixed release notes to clarify this is for classic skin
* HTML-escaping the message to match Monobook behavior

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d0a2e29..4cbe771 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -177,7 +177,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
+* (bug 17488) RSS/Atom links in left toolbar are now localized in classic skin
 * (bug 17472) use print <<<EOF in maintenance/importTextFile.php
 * Special:PrefixIndex: Move table styling to shared.css, add CSS IDs to tables
   use correct message 'allpagesprefix' for input form label, replace _ with ' '

diff --git a/includes/Skin.php b/includes/Skin.php
index 6cba23e..f5217cd 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1021,7 +1021,7 @@ END;
                        foreach( $wgFeedClasses as $format => $class ) {
                                $feedurl = $wgRequest->escapeAppendQuery( "feed=$format" );
                                $s[] = "<a href=\"$feedurl\" rel=\"alternate\" type=\"application/{$format}+xml\""
-                                               . " class=\"feedlink\">" . wfMsg( "feed-$format" ) . "</a>";
+                                               . " class=\"feedlink\">" . wfMsgHtml( "feed-$format" ) . "</a>";
                        }
                }
                return $wgLang->pipeList( $s );