| Index: trunk/phase3/tests/phpunit/includes/HtmlTest.php |
| — | — | @@ -3,19 +3,23 @@ |
| 4 | 4 | |
| 5 | 5 | class HtmlTest extends MediaWikiTestCase { |
| 6 | 6 | private static $oldLang; |
| | 7 | + private static $oldContLang; |
| 7 | 8 | |
| 8 | 9 | public function setUp() { |
| 9 | | - global $wgLang, $wgLanguageCode; |
| | 10 | + global $wgLang, $wgContLang, $wgLanguageCode; |
| 10 | 11 | |
| 11 | 12 | self::$oldLang = $wgLang; |
| | 13 | + self::$oldContLang = $wgContLang; |
| | 14 | + |
| 12 | 15 | $wgLanguageCode = 'en'; |
| 13 | | - $wgLang = Language::factory( $wgLanguageCode ); |
| | 16 | + $wgContLang = $wgLang = Language::factory( $wgLanguageCode ); |
| 14 | 17 | } |
| 15 | 18 | |
| 16 | 19 | public function tearDown() { |
| 17 | | - global $wgLang, $wgLanguageCode; |
| | 20 | + global $wgLang, $wgContLang, $wgLanguageCode; |
| 18 | 21 | $wgLang = self::$oldLang; |
| 19 | | - $wgLanguageCode = $wgLang->getCode(); |
| | 22 | + $wgContLang = self::$oldContLang; |
| | 23 | + $wgLanguageCode = $wgContLang->getCode(); |
| 20 | 24 | } |
| 21 | 25 | |
| 22 | 26 | public function testExpandAttributesSkipsNullAndFalse() { |