| Index: trunk/phase3/tests/LanguageConverterTest.php |
| — | — | @@ -81,11 +81,12 @@ |
| 82 | 82 | $this->assertEquals('tg-latn', $this->lc->getPreferredVariant(true, true)); |
| 83 | 83 | |
| 84 | 84 | $wgRequest->setVal('variant', 'tg'); |
| 85 | | - $wgUser->setOption('variant', 'tg-latn'); |
| | 85 | + $wgUser->setOption('variant', 'tg-latn'); // The user's data is ignored |
| | 86 | + // because the variant is set in the URL. |
| 86 | 87 | $this->lc = new TestConverter( $this->lang, 'tg', |
| 87 | 88 | array( 'tg', 'tg-latn' ) ); |
| 88 | | - $this->assertEquals('tg-latn', $this->lc->getPreferredVariant(true, false)); |
| 89 | | - $this->assertEquals('tg-latn', $this->lc->getPreferredVariant(true, true)); |
| | 89 | + $this->assertEquals('tg', $this->lc->getPreferredVariant(true, false)); |
| | 90 | + $this->assertEquals('tg', $this->lc->getPreferredVariant(true, true)); |
| 90 | 91 | |
| 91 | 92 | $wgRequest->setVal('variant', null); |
| 92 | 93 | $wgDefaultLanguageVariant = 'tg-latn'; |