Swap else if for elseif

Trimming trailing whitespace also
This commit is contained in:
Sam Reed 2011-06-17 16:25:46 +00:00
parent 53e533d1e0
commit 8dc92c6ce2
1 changed files with 4 additions and 4 deletions

View File

@ -110,7 +110,7 @@ class EmailContactForm {
$this->wasPosted = $wgRequest->wasPosted(); $this->wasPosted = $wgRequest->wasPosted();
$this->formType = $wgRequest->getText( 'formtype', $par ); $this->formType = $wgRequest->getText( 'formtype', $par );
# Check for type in [[Special:Contact/type]]: change pagetext and prefill form fields # Check for type in [[Special:Contact/type]]: change pagetext and prefill form fields
if ( $this->formType != '' ) { if ( $this->formType != '' ) {
$message = 'contactpage-pagetext-' . $this->formType; $message = 'contactpage-pagetext-' . $this->formType;
@ -136,7 +136,7 @@ class EmailContactForm {
} else { } else {
$this->text = $wgRequest->getText( 'wpText' ); $this->text = $wgRequest->getText( 'wpText' );
} }
} else { } else {
$this->formularText = wfMsgExt( 'contactpage-pagetext', 'parse' ); $this->formularText = wfMsgExt( 'contactpage-pagetext', 'parse' );
$this->text = $wgRequest->getText( 'wpText' ); $this->text = $wgRequest->getText( 'wpText' );
$this->subject = $wgRequest->getText( 'wpSubject' ); $this->subject = $wgRequest->getText( 'wpSubject' );
@ -274,7 +274,7 @@ class EmailContactForm {
'</td> '</td>
</tr>'; </tr>';
} }
$ccme = $this->wasPosted ? $this->cc_me : $wgUser->getBoolOption( 'ccmeonemails' ); $ccme = $this->wasPosted ? $this->cc_me : $wgUser->getBoolOption( 'ccmeonemails' );
$form .= '<tr> $form .= '<tr>
<td></td> <td></td>
@ -380,7 +380,7 @@ class EmailContactForm {
} else { } else {
$subject = wfMsgForContent( 'contactpage-subject-and-sender', $subject, $this->fromaddress ); $subject = wfMsgForContent( 'contactpage-subject-and-sender', $subject, $this->fromaddress );
} }
} else if ( $includeIP ) { } elseif ( $includeIP ) {
$subject = wfMsgForContent( 'contactpage-subject-and-sender', $subject, $senderIP ); $subject = wfMsgForContent( 'contactpage-subject-and-sender', $subject, $senderIP );
} }