Trim up trailing newlines before footer gets added.

[lhc/web/wiklou.git] / includes / specials / SpecialEmailuser.php

diff --git a/includes/specials/SpecialEmailuser.php b/includes/specials/SpecialEmailuser.php
index e81ef93..3874c6a 100644 (file)
--- a/includes/specials/SpecialEmailuser.php
+++ b/includes/specials/SpecialEmailuser.php
@@ -148,8 +148,8 @@ class EmailUserForm {
                $from = new MailAddress( $wgUser );
                $subject = $this->subject;
 
-               // Add a standard footer
-               $this->text = $this->text . "\n ---- \n" . wfMsgExt( 'emailuserfooter',
+               // Add a standard footer and trim up trailing newlines
+               $this->text = rtrim($this->text) . "\n\n---\n" . wfMsgExt( 'emailuserfooter',
                        array( 'content', 'parsemag' ), array( $from->name, $to->name ) );
                
                if( wfRunHooks( 'EmailUser', array( &$to, &$from, &$subject, &$this->text ) ) ) {