http://www.mediawiki.org/wiki/Special:Code/MediaWiki/60993
Revision: 60993
Author: mah
Date: 2010-01-12 23:05:41 +0000 (Tue, 12 Jan 2010)
Log Message:
-----------
follow-up r60986: Revert earlier test change - philip showed me the error of my
ways.
Modified Paths:
--------------
trunk/phase3/tests/LanguageConverterTest.php
Modified: trunk/phase3/tests/LanguageConverterTest.php
===================================================================
--- trunk/phase3/tests/LanguageConverterTest.php 2010-01-12 22:57:04 UTC
(rev 60992)
+++ trunk/phase3/tests/LanguageConverterTest.php 2010-01-12 23:05:41 UTC
(rev 60993)
@@ -81,11 +81,12 @@
$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';
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
