From f010886901f8a6c37c356b48648f4f9c8ffd9006 Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Tue, 29 Jun 2010 06:39:32 +0000
Subject: [PATCH] Revert r66835, r66846: it's too late to break interfaces in
 1.16.

---
 includes/Skin.php | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/includes/Skin.php b/includes/Skin.php
index 8e196f92b1..ab34b33a8a 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -2107,7 +2107,7 @@ CSS;
 		}
 
 		$bar = array();
-		$this->addToSidebar( $bar, wfMsgForContentNoTrans( 'sidebar' ) );
+		$this->addToSidebar( $bar, 'sidebar' );
 
 		wfRunHooks( 'SkinBuildSidebar', array( $this, &$bar ) );
 		if ( $wgEnableSidebarCache ) {
@@ -2116,16 +2116,26 @@ CSS;
 		wfProfileOut( __METHOD__ );
 		return $bar;
 	}
+	/**
+	 * Add content from a sidebar system message
+	 * Currently only used for MediaWiki:Sidebar (but may be used by Extensions)
+	 *
+	 * This is just a wrapper around addToSidebarPlain() for backwards compatibility
+	 * 
+	 * @param &$bar array
+	 * @param $message String
+	 */
+	function addToSidebar( &$bar, $message ) {
+		$this->addToSidebarPlain( $bar, wfMsgForContent( $message ) );
+	}
 	
 	/**
-	 * Add content to the sidebar from text
-	 * @since 1.16
+	 * Add content from plain text
+	 * @since 1.17
 	 * @param &$bar array
 	 * @param $text string
-	 * 
-	 * @return array
 	 */
-	function addToSidebar( &$bar, $text ) {
+	function addToSidebarPlain( &$bar, $text ) {
 		$lines = explode( "\n", $text );
 		$wikiBar = array(); # We need to handle the wikitext on a different variable, to avoid trying to do an array operation on text, which would be a fatal error.
 
@@ -2142,9 +2152,6 @@ CSS;
 			} else {
 				$line = trim( $line, '* ' );
 				if( strpos( $line, '|' ) !== false ) { // sanity check
-					global $wgMessageCache;
-					$line = $wgMessageCache->transform( $line );
-					
 					$line = array_map( 'trim', explode( '|', $line, 2 ) );
 					$link = wfMsgForContent( $line[0] );
 					if( $link == '-' ) {
-- 
2.20.1