dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Simplify HTMLTitleTextField::validate"
[lhc/web/wiklou.git]
/
includes
/
htmlform
/
fields
/
HTMLTitleTextField.php
diff --git
a/includes/htmlform/fields/HTMLTitleTextField.php
b/includes/htmlform/fields/HTMLTitleTextField.php
index
93d09e7
..
dd9f793
100644
(file)
--- a/
includes/htmlform/fields/HTMLTitleTextField.php
+++ b/
includes/htmlform/fields/HTMLTitleTextField.php
@@
-1,6
+1,5
@@
<?php
<?php
-use MediaWiki\MediaWikiServices;
use MediaWiki\Widget\TitleInputWidget;
/**
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
$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 ) {
}
} 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();
}
$text = $title->getPrefixedText();