From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 16 Dec 2008 23:57:21 +0000 (+0000)
Subject: Cleanup r44683 -- fix E_NOTICE bug in MWNamespace::getCanonicalName() instead of... 
X-Git-Tag: 1.31.0-rc.0~43924
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dcompta/operations/modifier.php?a=commitdiff_plain;h=2f1cee5b91d405b4815c6bd464c498a59599059f;p=lhc%2Fweb%2Fwiklou.git

Cleanup r44683 -- fix E_NOTICE bug in MWNamespace::getCanonicalName() instead of replicating the function. :)
(Also note -- using MWNamespace instead of Namespace for PHP 5.3 compat.)
---

diff --git a/includes/Namespace.php b/includes/Namespace.php
index 011fc949e2..3d618e649f 100644
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -105,11 +105,15 @@ class MWNamespace {
 	 * Returns the canonical (English Wikipedia) name for a given index
 	 *
 	 * @param $index Int: namespace index
-	 * @return string
+	 * @return string or false if no canonical definition.
 	 */
 	public static function getCanonicalName( $index ) {
 		global $wgCanonicalNamespaceNames;
-		return $wgCanonicalNamespaceNames[$index];
+		if( isset( $wgCanonicalNamespaceNames[$index] ) ) {
+			return $wgCanonicalNamespaceNames[$index];
+		} else {
+			return false;
+		}
 	}
 
 	/**
diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index 8c7aee33d9..5e503709e3 100644
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -127,7 +127,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 	}
 
 	protected function appendNamespaces( $property ) {
-		global $wgContLang, $wgCanonicalNamespaceNames;
+		global $wgContLang;
 		$data = array();
 		foreach( $wgContLang->getFormattedNamespaces() as $ns => $title )
 		{
@@ -135,7 +135,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 				'id' => $ns
 			);
 			ApiResult :: setContent( $data[$ns], $title );
-			$canonical = isset($wgCanonicalNamespaceNames[$ns]) ? $wgCanonicalNamespaceNames[$ns] : false;
+			$canonical = MWNamespace::getCanonicalName( $ns );
 			
 			if( MWNamespace::hasSubpages( $ns ) )
 				$data[$ns]['subpages'] = '';