From 086ae52d12011746a75f5588e877347bc0457352 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Fri, 21 Mar 2008 11:49:34 +0100
Subject: Update auf MediaWiki 1.12.0

---
 includes/SpecialConfirmemail.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'includes/SpecialConfirmemail.php')

diff --git a/includes/SpecialConfirmemail.php b/includes/SpecialConfirmemail.php
index ba419f25..c3aa53c2 100644
--- a/includes/SpecialConfirmemail.php
+++ b/includes/SpecialConfirmemail.php
@@ -30,7 +30,7 @@ class EmailConfirmation extends UnlistedSpecialPage {
 				if( User::isValidEmailAddr( $wgUser->getEmail() ) ) {
 					$this->showRequestForm();
 				} else {
-					$wgOut->addWikiText( wfMsg( 'confirmemail_noemail' ) );
+					$wgOut->addWikiMsg( 'confirmemail_noemail' );
 				}
 			} else {
 				$title = SpecialPage::getTitleFor( 'Userlogin' );
@@ -52,19 +52,19 @@ class EmailConfirmation extends UnlistedSpecialPage {
 		if( $wgRequest->wasPosted() && $wgUser->matchEditToken( $wgRequest->getText( 'token' ) ) ) {
 			$ok = $wgUser->sendConfirmationMail();
 			if ( WikiError::isError( $ok ) ) {
-				$wgOut->addWikiText( wfMsg( 'confirmemail_sendfailed', $ok->toString() ) );
+				$wgOut->addWikiMsg( 'confirmemail_sendfailed', $ok->toString() );
 			} else {
-				$wgOut->addWikiText( wfMsg( 'confirmemail_sent' ) );
+				$wgOut->addWikiMsg( 'confirmemail_sent' );
 			}
 		} else {
 			if( $wgUser->isEmailConfirmed() ) {
 				$time = $wgLang->timeAndDate( $wgUser->mEmailAuthenticated, true );
-				$wgOut->addWikiText( wfMsg( 'emailauthenticated', $time ) );
+				$wgOut->addWikiMsg( 'emailauthenticated', $time );
 			}
 			if( $wgUser->isEmailConfirmationPending() ) {
-				$wgOut->addWikiText( wfMsg( 'confirmemail_pending' ) );
+				$wgOut->addWikiMsg( 'confirmemail_pending' );
 			}
-			$wgOut->addWikiText( wfMsg( 'confirmemail_text' ) );
+			$wgOut->addWikiMsg( 'confirmemail_text' );
 			$self = SpecialPage::getTitleFor( 'Confirmemail' );		
 			$form  = wfOpenElement( 'form', array( 'method' => 'post', 'action' => $self->getLocalUrl() ) );
 			$form .= wfHidden( 'token', $wgUser->editToken() );
@@ -86,16 +86,16 @@ class EmailConfirmation extends UnlistedSpecialPage {
 		if( is_object( $user ) ) {
 			if( $user->confirmEmail() ) {
 				$message = $wgUser->isLoggedIn() ? 'confirmemail_loggedin' : 'confirmemail_success';
-				$wgOut->addWikiText( wfMsg( $message ) );
+				$wgOut->addWikiMsg( $message );
 				if( !$wgUser->isLoggedIn() ) {
 					$title = SpecialPage::getTitleFor( 'Userlogin' );
 					$wgOut->returnToMain( true, $title->getPrefixedText() );
 				}
 			} else {
-				$wgOut->addWikiText( wfMsg( 'confirmemail_error' ) );
+				$wgOut->addWikiMsg( 'confirmemail_error' );
 			}
 		} else {
-			$wgOut->addWikiText( wfMsg( 'confirmemail_invalid' ) );
+			$wgOut->addWikiMsg( 'confirmemail_invalid' );
 		}
 	}
 	
-- 
cgit v1.2.3-54-g00ecf