X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fhtmlform%2Ffields%2FHTMLTitleTextField.php;h=93d09e7f14d1f57f83bbcd078d0799a7fd364c8c;hb=b79bc0a2740b991525aae355ed216e0b9dc3aa86;hp=602ddee486d05608dee275c718ad16df1047d54c;hpb=8c96aec32cffaab96b2bd9dca206a99a13640545;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/htmlform/fields/HTMLTitleTextField.php b/includes/htmlform/fields/HTMLTitleTextField.php
index 602ddee486..93d09e7f14 100644
--- a/includes/htmlform/fields/HTMLTitleTextField.php
+++ b/includes/htmlform/fields/HTMLTitleTextField.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\MediaWikiServices;
 use MediaWiki\Widget\TitleInputWidget;
 
 /**
@@ -41,6 +42,11 @@ class HTMLTitleTextField extends HTMLTextField {
 			return parent::validate( $value, $alldata );
 		}
 
+		// Default value (from getDefault()) is null, which breaks Title::newFromTextThrow() below
+		if ( $value === null ) {
+			$value = '';
+		}
+
 		if ( !$this->mParams['required'] && $value === '' ) {
 			// If this field is not required and the value is empty, that's okay, skip validation
 			return parent::validate( $value, $alldata );
@@ -51,8 +57,8 @@ class HTMLTitleTextField extends HTMLTextField {
 				$title = Title::newFromTextThrow( $value );
 			} else {
 				// Can't use Title::makeTitleSafe(), because it doesn't throw useful exceptions
-				global $wgContLang;
-				$namespaceName = $wgContLang->getNsText( $this->mParams['namespace'] );
+				$namespaceName = MediaWikiServices::getInstance()->getContentLanguage()->
+					getNsText( $this->mParams['namespace'] );
 				$title = Title::newFromTextThrow( $namespaceName . ':' . $value );
 			}
 		} catch ( MalformedTitleException $e ) {