Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed return type of getContentNamespaces()

Browse source 
Change-Id: I3e1717c3a7b3f9d7fa7fd823b5d3143a679b0d3d
This commit is contained in:
Aaron Schulz 2013-07-04 12:55:47 -07:00
parent 4abdb946e3
commit a3a1bc0bef
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/Namespace.php
View file

@ -334,7 +334,7 @@ class MWNamespace {
public static function getContentNamespaces() {
global $wgContentNamespaces;
if ( !is_array( $wgContentNamespaces ) || $wgContentNamespaces === array() ) {
return NS_MAIN;
return array( NS_MAIN );
} elseif ( !in_array( NS_MAIN, $wgContentNamespaces ) ) {
// always force NS_MAIN to be part of array (to match the algorithm used by isContent)
return array_merge( array( NS_MAIN ), $wgContentNamespaces );

10
tests/phpunit/includes/MWNamespaceTest.php
View file

@ -350,20 +350,20 @@ class MWNamespaceTest extends MediaWikiTestCase {
# test !is_array( $wgcontentNamespaces )
$wgContentNamespaces = '';
$this->assertEquals( NS_MAIN, MWNamespace::getContentNamespaces() );
$this->assertEquals( array( NS_MAIN ), MWNamespace::getContentNamespaces() );
$wgContentNamespaces = false;
$this->assertEquals( NS_MAIN, MWNamespace::getContentNamespaces() );
$this->assertEquals( array( NS_MAIN ), MWNamespace::getContentNamespaces() );
$wgContentNamespaces = null;
$this->assertEquals( NS_MAIN, MWNamespace::getContentNamespaces() );
$this->assertEquals( array( NS_MAIN ), MWNamespace::getContentNamespaces() );
$wgContentNamespaces = 5;
$this->assertEquals( NS_MAIN, MWNamespace::getContentNamespaces() );
$this->assertEquals( array( NS_MAIN ), MWNamespace::getContentNamespaces() );
# test $wgContentNamespaces === array()
$wgContentNamespaces = array();
$this->assertEquals( NS_MAIN, MWNamespace::getContentNamespaces() );
$this->assertEquals( array( NS_MAIN ), MWNamespace::getContentNamespaces() );
# test !in_array( NS_MAIN, $wgContentNamespaces )
$wgContentNamespaces = array( NS_USER, NS_CATEGORY );