From d9022f63880ce039446fba8364f68e656b7bf4cb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 3 May 2012 13:01:35 +0200
Subject: Update to MediaWiki 1.19.0

---
 tests/phpunit/skins/SideBarTest.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'tests/phpunit/skins/SideBarTest.php')

diff --git a/tests/phpunit/skins/SideBarTest.php b/tests/phpunit/skins/SideBarTest.php
index bf79e760..912d7602 100644
--- a/tests/phpunit/skins/SideBarTest.php
+++ b/tests/phpunit/skins/SideBarTest.php
@@ -37,6 +37,7 @@ class SideBarTest extends MediaWikiLangTestCase {
 		parent::setUp();
 		$this->initMessagesHref();
 		$this->skin = new SkinTemplate();
+		$this->skin->getContext()->setLanguage( Language::factory( 'en' ) );
 	}
 	function tearDown() {
 		parent::tearDown();
@@ -106,7 +107,7 @@ class SideBarTest extends MediaWikiLangTestCase {
 
 	}
 	/**
-	 * bug 33321
+	 * bug 33321 - Make sure there's a | after transforming.
 	 * @group Database
 	 */
 	function testTrickyPipe() {
@@ -168,7 +169,7 @@ class SideBarTest extends MediaWikiLangTestCase {
 	}
 
 	/**
-	 * Test wgNoFollowLinks in sidebar
+	 * Test $wgNoFollowLinks in sidebar
 	 */
 	function testRespectWgnofollowlinks() {
 		global $wgNoFollowLinks;
@@ -177,7 +178,7 @@ class SideBarTest extends MediaWikiLangTestCase {
 
 		$attribs = $this->getAttribs();
 		$this->assertArrayNotHasKey( 'rel', $attribs,
-			'External URL in sidebar do not have rel=nofollow when wgNoFollowLinks = false'
+			'External URL in sidebar do not have rel=nofollow when $wgNoFollowLinks = false'
 		);
 
 		// Restore global
@@ -185,7 +186,7 @@ class SideBarTest extends MediaWikiLangTestCase {
 	}
 
 	/**
-	 * Test wgExternaLinkTarget in sidebar
+	 * Test $wgExternaLinkTarget in sidebar
 	 */
 	function testRespectExternallinktarget() {
 		global $wgExternalLinkTarget;
-- 
cgit v1.2.2