(bug 8701) Check database lock status when blocking/unblocking users

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

diff --git a/includes/SpecialConfirmemail.php b/includes/SpecialConfirmemail.php
index 94104f3..e64232a 100644 (file)
--- a/includes/SpecialConfirmemail.php
+++ b/includes/SpecialConfirmemail.php
@@ -36,8 +36,8 @@ class EmailConfirmation extends SpecialPage {
                                        $wgOut->addWikiText( wfMsg( 'confirmemail_noemail' ) );
                                }
                        } else {
-                               $title = Title::makeTitle( NS_SPECIAL, 'Userlogin' );
-                               $self = Title::makeTitle( NS_SPECIAL, 'Confirmemail' );
+                               $title = SpecialPage::getTitleFor( 'Userlogin' );
+                               $self = SpecialPage::getTitleFor( 'Confirmemail' );
                                $skin = $wgUser->getSkin();
                                $llink = $skin->makeKnownLinkObj( $title, wfMsgHtml( 'loginreqlink' ), 'returnto=' . $self->getPrefixedUrl() );
                                $wgOut->addHtml( wfMsgWikiHtml( 'confirmemail_needlogin', $llink ) );
@@ -64,8 +64,11 @@ 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 = Title::makeTitle( NS_SPECIAL, 'Confirmemail' );         
+                       $self = SpecialPage::getTitleFor( 'Confirmemail' );             
                        $form  = wfOpenElement( 'form', array( 'method' => 'post', 'action' => $self->getLocalUrl() ) );
                        $form .= wfHidden( 'token', $wgUser->editToken() );
                        $form .= wfSubmitButton( wfMsgHtml( 'confirmemail_send' ) );
@@ -88,7 +91,7 @@ class EmailConfirmation extends SpecialPage {
                                $message = $wgUser->isLoggedIn() ? 'confirmemail_loggedin' : 'confirmemail_success';
                                $wgOut->addWikiText( wfMsg( $message ) );
                                if( !$wgUser->isLoggedIn() ) {
-                                       $title = Title::makeTitle( NS_SPECIAL, 'Userlogin' );
+                                       $title = SpecialPage::getTitleFor( 'Userlogin' );
                                        $wgOut->returnToMain( true, $title->getPrefixedText() );
                                }
                        } else {