From 5e68007f3d29f0b8dda12fdc1974f60e26518b9a Mon Sep 17 00:00:00 2001 From: "Mark A. Hershberger" Date: Tue, 12 Jan 2010 23:05:41 +0000 Subject: [PATCH] follow-up r60986: Revert earlier test change - philip showed me the error of my ways. --- tests/LanguageConverterTest.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/LanguageConverterTest.php b/tests/LanguageConverterTest.php index 480de72532..8991b16a3a 100644 --- a/tests/LanguageConverterTest.php +++ b/tests/LanguageConverterTest.php @@ -81,11 +81,12 @@ class LanguageConverterTest extends PHPUnit_Framework_TestCase { $this->assertEquals('tg-latn', $this->lc->getPreferredVariant(true, true)); $wgRequest->setVal('variant', 'tg'); - $wgUser->setOption('variant', 'tg-latn'); + $wgUser->setOption('variant', 'tg-latn'); // The user's data is ignored + // because the variant is set in the URL. $this->lc = new TestConverter( $this->lang, 'tg', array( 'tg', 'tg-latn' ) ); - $this->assertEquals('tg-latn', $this->lc->getPreferredVariant(true, false)); - $this->assertEquals('tg-latn', $this->lc->getPreferredVariant(true, true)); + $this->assertEquals('tg', $this->lc->getPreferredVariant(true, false)); + $this->assertEquals('tg', $this->lc->getPreferredVariant(true, true)); $wgRequest->setVal('variant', null); $wgDefaultLanguageVariant = 'tg-latn'; -- 2.20.1