From e922aef37350d486b1123e35dee6bb2b8dd75d14 Mon Sep 17 00:00:00 2001 From: Raimond Spekking Date: Thu, 29 Jan 2009 20:54:47 +0000 Subject: [PATCH] * Move class=error from message to program code. Other languages will be handled by Translatewiki * Wrap message 'confirmemail_pending' into a div with CSS classes "error" and "mw-confirmemail-pending" * Fix double escaping of submit button --- RELEASE-NOTES | 2 ++ includes/specials/SpecialConfirmemail.php | 4 ++-- languages/messages/MessagesEn.php | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index a8ae408d21..9cb7a27299 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -69,6 +69,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * (bug 16604) Show title/rev in IRC for patrol log * (bug 16854) Whether a page is being parsed as a preview or section preview can now be determined and set with ParserOptions. +* Wrap message 'confirmemail_pending' into a div with CSS classes "error" and + "mw-confirmemail-pending" === Bug fixes in 1.15 === * (bug 16968) Special:Upload no longer throws useless warnings. diff --git a/includes/specials/SpecialConfirmemail.php b/includes/specials/SpecialConfirmemail.php index e19aa99b4a..9c6f857da7 100644 --- a/includes/specials/SpecialConfirmemail.php +++ b/includes/specials/SpecialConfirmemail.php @@ -68,13 +68,13 @@ class EmailConfirmation extends UnlistedSpecialPage { $wgOut->addWikiMsg( 'emailauthenticated', $time, $d, $t ); } if( $wgUser->isEmailConfirmationPending() ) { - $wgOut->addWikiMsg( 'confirmemail_pending' ); + $wgOut->wrapWikiMsg( "
$1
", 'confirmemail_pending' ); } $wgOut->addWikiMsg( 'confirmemail_text' ); $self = SpecialPage::getTitleFor( 'Confirmemail' ); $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $self->getLocalUrl() ) ); $form .= Xml::hidden( 'token', $wgUser->editToken() ); - $form .= Xml::submitButton( wfMsgHtml( 'confirmemail_send' ) ); + $form .= Xml::submitButton( wfMsg( 'confirmemail_send' ) ); $form .= Xml::closeElement( 'form' ); $wgOut->addHTML( $form ); } diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 2db06fcde5..272f589eb6 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -3496,8 +3496,8 @@ Others will be hidden by default. Activate the button below to send a confirmation mail to your address. The mail will include a link containing a code; load the link in your browser to confirm that your e-mail address is valid.', -'confirmemail_pending' => '
A confirmation code has already been e-mailed to you; -if you recently created your account, you may wish to wait a few minutes for it to arrive before trying to request a new code.
', +'confirmemail_pending' => 'A confirmation code has already been e-mailed to you; +if you recently created your account, you may wish to wait a few minutes for it to arrive before trying to request a new code.', 'confirmemail_send' => 'Mail a confirmation code', 'confirmemail_sent' => 'Confirmation e-mail sent.', 'confirmemail_oncreate' => 'A confirmation code was sent to your e-mail address. -- 2.20.1