Return nothing on empty math tags instead of char encoding

[lhc/web/wiklou.git] / includes / SpecialConfirmemail.php

diff --git a/includes/SpecialConfirmemail.php b/includes/SpecialConfirmemail.php
index e428d6c..e64232a 100644 (file)
--- a/includes/SpecialConfirmemail.php
+++ b/includes/SpecialConfirmemail.php
@@ -38,7 +38,8 @@ class EmailConfirmation extends SpecialPage {
                        } else {
                                $title = SpecialPage::getTitleFor( 'Userlogin' );
                                $self = SpecialPage::getTitleFor( 'Confirmemail' );
-                               $llink = Linker::makeKnownLinkObj( $title, wfMsgHtml( 'loginreqlink' ), 'returnto=' . $self->getPrefixedUrl() );
+                               $skin = $wgUser->getSkin();
+                               $llink = $skin->makeKnownLinkObj( $title, wfMsgHtml( 'loginreqlink' ), 'returnto=' . $self->getPrefixedUrl() );
                                $wgOut->addHtml( wfMsgWikiHtml( 'confirmemail_needlogin', $llink ) );
                        }
                } else {
@@ -63,6 +64,9 @@ class EmailConfirmation extends SpecialPage {
                                $time = $wgLang->timeAndDate( $wgUser->mEmailAuthenticated, true );
                                $wgOut->addWikiText( wfMsg( 'emailauthenticated', $time ) );
                        }
+                       if( $wgUser->isEmailConfirmationPending() ) {
+                               $wgOut->addWikiText( wfMsg( 'confirmemail_pending' ) );
+                       }
                        $wgOut->addWikiText( wfMsg( 'confirmemail_text' ) );
                        $self = SpecialPage::getTitleFor( 'Confirmemail' );             
                        $form  = wfOpenElement( 'form', array( 'method' => 'post', 'action' => $self->getLocalUrl() ) );