Parse messages in string context
Change-Id: I8b459547448d5843557a84f14145c9278f8b340a
This commit is contained in:
parent
69290479e0
commit
5056104f4d
|
@ -439,8 +439,9 @@ class SpecialContact extends UnlistedSpecialPage {
|
||||||
);
|
);
|
||||||
|
|
||||||
if ( !$mailResult->isOK() ) {
|
if ( !$mailResult->isOK() ) {
|
||||||
wfDebug( __METHOD__ . ': got error from UserMailer: ' . $mailResult->getMessage() . "\n" );
|
wfDebug( __METHOD__ . ': got error from UserMailer: ' .
|
||||||
return $this->msg( 'contactpage-usermailererror' )->text() . $mailResult->getMessage();
|
$mailResult->getMessage()->text() . "\n" );
|
||||||
|
return $this->msg( 'contactpage-usermailererror' )->text() . $mailResult->getMessage()->text();
|
||||||
}
|
}
|
||||||
|
|
||||||
// if the user requested a copy of this mail, do this now,
|
// if the user requested a copy of this mail, do this now,
|
||||||
|
@ -460,7 +461,7 @@ class SpecialContact extends UnlistedSpecialPage {
|
||||||
// We can either show them an error, or we can say everything was fine,
|
// We can either show them an error, or we can say everything was fine,
|
||||||
// or we can say we sort of failed AND sort of succeeded. Of these options,
|
// or we can say we sort of failed AND sort of succeeded. Of these options,
|
||||||
// simply saying there was an error is probably best.
|
// simply saying there was an error is probably best.
|
||||||
return $this->msg( 'contactpage-usermailererror' )->text() . $ccResult->getMessage();
|
return $this->msg( 'contactpage-usermailererror' )->text() . $ccResult->getMessage()->text();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue