X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMWNamespace.php;h=b40da0036070e7f4b53004d3565885e3f5f26631;hb=ab4feff3ca31a11ee8d1fbcd49941c13c4d9ac31;hp=e03a29b80f08f68dbf59ec10f7f7c6411cfefd98;hpb=939bd15d960b39a089f10a7db62220d48fe165a5;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MWNamespace.php b/includes/MWNamespace.php
index e03a29b80f..b40da00360 100644
--- a/includes/MWNamespace.php
+++ b/includes/MWNamespace.php
@@ -19,6 +19,7 @@
  *
  * @file
  */
+use MediaWiki\MediaWikiServices;
 
 /**
  * This is a utility class with only static functions
@@ -306,6 +307,7 @@ class MWNamespace {
 	 * @return bool True if this namespace either is or has a corresponding talk namespace.
 	 */
 	public static function canTalk( $index ) {
+		wfDeprecated( __METHOD__, '1.30' );
 		return self::hasTalkNamespace( $index );
 	}
 
@@ -462,13 +464,17 @@ class MWNamespace {
 	 * Get the default content model for a namespace
 	 * This does not mean that all pages in that namespace have the model
 	 *
+	 * @note To determine the default model for a new page's main slot, or any slot in general,
+	 * use SlotRoleHandler::getDefaultModel() together with SlotRoleRegistry::getRoleHandler().
+	 *
 	 * @since 1.21
 	 * @param int $index Index to check
 	 * @return null|string Default model name for the given namespace, if set
 	 */
 	public static function getNamespaceContentModel( $index ) {
-		global $wgNamespaceContentModels;
-		return $wgNamespaceContentModels[$index] ?? null;
+		$config = MediaWikiServices::getInstance()->getMainConfig();
+		$models = $config->get( 'NamespaceContentModels' );
+		return $models[$index] ?? null;
 	}
 
 	/**