From: daniel <daniel.kinzler@wikimedia.de>
Date: Sat, 8 Dec 2012 21:09:30 +0000 (+0100)
Subject: Fix condition for the entries with a null model.
X-Git-Tag: 1.31.0-rc.0~21374
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=d9cd65c902592b9c86f7315e4b8028b11250c66c;p=lhc%2Fweb%2Fwiklou.git

Fix condition for the entries with a null model.

A null model means ‘guess from page name’.

Change-Id: I63e80761e46cc7707e9c862e2e50a950c1766aa4
---

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." );
 		}