*/
protected $displayFormat = 'ooui';
- public static function loadInputFromParameters( $fieldname, $descriptor, HTMLForm $parent = null ) {
+ public static function loadInputFromParameters( $fieldname, $descriptor,
+ HTMLForm $parent = null
+ ) {
$field = parent::loadInputFromParameters( $fieldname, $descriptor, $parent );
$field->setShowEmptyLabel( false );
return $field;
function getErrors( $err ) {
if ( !$err ) {
$errors = array();
- } else if ( $err instanceof Status ) {
+ } elseif ( $err instanceof Status ) {
if ( $err->isOK() ) {
$errors = array();
} else {
$msg = $error;
$error = array();
}
- $error = $this->msg( $msg, $error )->parse();
+ // if the error is already a message object, don't use it as a message key
+ if ( !$msg instanceof Message ) {
+ $error = $this->msg( $msg, $error )->parse();
+ } else {
+ $error = $msg->parse();
+ }
$error = new OOUI\HtmlSnippet( $error );
}