From: Umherirrender <umherirrender_de.wp@web.de>
Date: Sat, 18 Aug 2018 02:53:01 +0000 (+0200)
Subject: Simplify HTMLTitleTextField::validate
X-Git-Tag: 1.34.0-rc.0~3981^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=e75de52391a4ef17893c60896eb1b81915e30cf0

Simplify HTMLTitleTextField::validate

Title::makeName already provide a way to build a title string with
namespace text

Change-Id: I21518ca9d7c6101fc866f8d667a88cc7bdf5ae7c
---

diff --git a/includes/htmlform/fields/HTMLTitleTextField.php b/includes/htmlform/fields/HTMLTitleTextField.php
index 93d09e7f14..dd9f793e1f 100644
--- a/includes/htmlform/fields/HTMLTitleTextField.php
+++ b/includes/htmlform/fields/HTMLTitleTextField.php
@@ -1,6 +1,5 @@
 <?php
 
-use MediaWiki\MediaWikiServices;
 use MediaWiki\Widget\TitleInputWidget;
 
 /**
@@ -57,17 +56,10 @@ class HTMLTitleTextField extends HTMLTextField {
 				$title = Title::newFromTextThrow( $value );
 			} else {
 				// Can't use Title::makeTitleSafe(), because it doesn't throw useful exceptions
-				$namespaceName = MediaWikiServices::getInstance()->getContentLanguage()->
-					getNsText( $this->mParams['namespace'] );
-				$title = Title::newFromTextThrow( $namespaceName . ':' . $value );
+				$title = Title::newFromTextThrow( Title::makeName( $this->mParams['namespace'], $value ) );
 			}
 		} catch ( MalformedTitleException $e ) {
-			$msg = $this->msg( $e->getErrorMessage() );
-			$params = $e->getErrorMessageParameters();
-			if ( $params ) {
-				$msg->params( $params );
-			}
-			return $msg;
+			return $this->msg( $e->getErrorMessage(), $e->getErrorMessageParameters() );
 		}
 
 		$text = $title->getPrefixedText();