Swap numerous " -> '
Change-Id: Ia91978b410cc991ad2fb7100687e8ba7df8ff174
This commit is contained in:
parent
58d02126ea
commit
043453262f
|
@ -41,7 +41,7 @@ class SpecialContact extends SpecialPage {
|
||||||
|
|
||||||
if( !$wgEnableEmail ) {
|
if( !$wgEnableEmail ) {
|
||||||
// From Special:EmailUser
|
// From Special:EmailUser
|
||||||
throw new ErrorPageError( 'usermaildisabled', "usermaildisabledtext" );
|
throw new ErrorPageError( 'usermaildisabled', 'usermaildisabledtext' );
|
||||||
}
|
}
|
||||||
if( !$wgContactUser ) {
|
if( !$wgContactUser ) {
|
||||||
$this->getOutput()->showErrorPage( 'nosuchspecialpage', 'nospecialpagetext' );
|
$this->getOutput()->showErrorPage( 'nosuchspecialpage', 'nospecialpagetext' );
|
||||||
|
@ -405,15 +405,15 @@ class EmailContactForm {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
wfDebug( __METHOD__ . ": sending mail from " . $submitterAddress->toString() .
|
wfDebug( __METHOD__ . ': sending mail from ' . $submitterAddress->toString() .
|
||||||
" to " . $targetAddress->toString().
|
' to ' . $targetAddress->toString().
|
||||||
" replyto " . ( $replyto == null ? '-/-' : $replyto->toString() ) . "\n" );
|
' replyto ' . ( $replyto == null ? '-/-' : $replyto->toString() ) . "\n" );
|
||||||
|
|
||||||
$mailResult = UserMailer::send( $targetAddress, $submitterAddress, $subject, $this->text, $replyto );
|
$mailResult = UserMailer::send( $targetAddress, $submitterAddress, $subject, $this->text, $replyto );
|
||||||
|
|
||||||
if( !$mailResult->isOK() ) {
|
if( !$mailResult->isOK() ) {
|
||||||
$wgOut->addWikiText( wfMessage( "usermailererror" )->text() . $mailResult->getMessage() );
|
$wgOut->addWikiText( wfMessage( 'usermailererror' )->text() . $mailResult->getMessage() );
|
||||||
wfDebug( __METHOD__ . ": got error from UserMailer: " . $mailResult->getMessage() . "\n" );
|
wfDebug( __METHOD__ . ': got error from UserMailer: ' . $mailResult->getMessage() . "\n" );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -422,8 +422,8 @@ class EmailContactForm {
|
||||||
if( $this->cc_me && $this->fromaddress ) {
|
if( $this->cc_me && $this->fromaddress ) {
|
||||||
$cc_subject = wfMessage( 'emailccsubject', $this->target->getName(), $subject )->text();
|
$cc_subject = wfMessage( 'emailccsubject', $this->target->getName(), $subject )->text();
|
||||||
if( wfRunHooks( 'ContactForm', array( &$submitterAddress, &$contactSender, &$cc_subject, &$this->text, $this->formType ) ) ) {
|
if( wfRunHooks( 'ContactForm', array( &$submitterAddress, &$contactSender, &$cc_subject, &$this->text, $this->formType ) ) ) {
|
||||||
wfDebug( __METHOD__ . ": sending cc mail from " . $contactSender->toString() .
|
wfDebug( __METHOD__ . ': sending cc mail from ' . $contactSender->toString() .
|
||||||
" to " . $submitterAddress->toString() . "\n" );
|
' to ' . $submitterAddress->toString() . "\n" );
|
||||||
$ccResult = UserMailer::send( $submitterAddress, $contactSender, $cc_subject, $this->text );
|
$ccResult = UserMailer::send( $submitterAddress, $contactSender, $cc_subject, $this->text );
|
||||||
if( !$ccResult->isOK() ) {
|
if( !$ccResult->isOK() ) {
|
||||||
// At this stage, the user's CC mail has failed, but their
|
// At this stage, the user's CC mail has failed, but their
|
||||||
|
|
Loading…
Reference in New Issue