* Fixed $wgProfileToDatabase/$wgProfileCallTree interaction (later disabled the former)

[lhc/web/wiklou.git] / includes / Skin.php

diff --git a/includes/Skin.php b/includes/Skin.php
index 6cba23e..a543023 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 );
@@ -1199,7 +1199,7 @@ END;
                #$s[] = $this->specialPagesList();
 
                if( $this->variantLinks() ) {
-                       $s = $this->variantLinks();
+                       $s[] = $this->variantLinks();
                }
 
                if( $this->extensionTabLinks() ) {