From d9cd65c902592b9c86f7315e4b8028b11250c66c Mon Sep 17 00:00:00 2001 From: daniel Date: Sat, 8 Dec 2012 22:09:30 +0100 Subject: [PATCH] Fix condition for the entries with a null model. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit A null model means ‘guess from page name’. Change-Id: I63e80761e46cc7707e9c862e2e50a950c1766aa4 --- tests/phpunit/includes/WikiPageTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/phpunit/includes/WikiPageTest.php b/tests/phpunit/includes/WikiPageTest.php index 5934e6a2cb..9300d4bd2a 100644 --- a/tests/phpunit/includes/WikiPageTest.php +++ b/tests/phpunit/includes/WikiPageTest.php @@ -546,7 +546,7 @@ class WikiPageTest extends MediaWikiLangTestCase { $title = Title::newFromText( $title ); - if ( !$wgContentHandlerUseDB && ContentHandler::getDefaultModelFor( $title ) != $model ) { + if ( !$wgContentHandlerUseDB && $model && ContentHandler::getDefaultModelFor( $title ) != $model ) { $this->markTestSkipped( "Can not use non-default content model $model for " . $title->getPrefixedDBkey() . " with \$wgContentHandlerUseDB disabled." ); } -- 2.20.1