From: jenkins-bot Date: Mon, 28 Mar 2016 02:23:01 +0000 (+0000) Subject: Merge "wgUseMediaWikiUIEverywhere false in Html/XmlTest" X-Git-Tag: 1.31.0-rc.0~7489 X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=16fbb5a18cd486aea991480fc2c5fce68ce2a904;hp=09208169f3f8bb28b76f96ff7439d81c713d6adf;p=lhc%2Fweb%2Fwiklou.git Merge "wgUseMediaWikiUIEverywhere false in Html/XmlTest" --- diff --git a/tests/phpunit/includes/HtmlTest.php b/tests/phpunit/includes/HtmlTest.php index 98eb0c5718..6c92b8cb81 100644 --- a/tests/phpunit/includes/HtmlTest.php +++ b/tests/phpunit/includes/HtmlTest.php @@ -8,6 +8,7 @@ class HtmlTest extends MediaWikiTestCase { $this->setMwGlobals( [ 'wgWellFormedXml' => false, + 'wgUseMediaWikiUIEverywhere' => false, ] ); $langObj = Language::factory( 'en' ); diff --git a/tests/phpunit/includes/XmlTest.php b/tests/phpunit/includes/XmlTest.php index 7b82d687a4..00d429e458 100644 --- a/tests/phpunit/includes/XmlTest.php +++ b/tests/phpunit/includes/XmlTest.php @@ -31,6 +31,7 @@ class XmlTest extends MediaWikiTestCase { $this->setMwGlobals( [ 'wgLang' => $langObj, 'wgWellFormedXml' => true, + 'wgUseMediaWikiUIEverywhere' => false, ] ); }