X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FMergeHistoryTest.php;h=f546dc202bd72aef9e6a05dceb39763ecbc38cae;hb=07a7bdce59722484c05b6397dc210932dd1abaec;hp=4544e9bed83bf9820f4ff2d95629694fdb9e93f1;hpb=4021a60eabf190ea0558f949f1231f0b46d9b94c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/MergeHistoryTest.php b/tests/phpunit/includes/MergeHistoryTest.php
index 4544e9bed8..f546dc202b 100644
--- a/tests/phpunit/includes/MergeHistoryTest.php
+++ b/tests/phpunit/includes/MergeHistoryTest.php
@@ -27,7 +27,6 @@ class MergeHistoryTest extends MediaWikiTestCase {
 	 * @param string|bool $error Expected error for test (or true for no error)
 	 */
 	public function testIsValidMerge( $source, $dest, $timestamp, $error ) {
-		$this->setMwGlobals( 'wgContentHandlerUseDB', false );
 		if ( $timestamp === true ) {
 			// Although this timestamp is after the latest timestamp of both pages,
 			// MergeHistory should select the latest source timestamp up to this which should