| Index: trunk/phase3/includes/specials/SpecialConfirmemail.php |
| — | — | @@ -68,13 +68,13 @@ |
| 69 | 69 | $wgOut->addWikiMsg( 'emailauthenticated', $time, $d, $t ); |
| 70 | 70 | } |
| 71 | 71 | if( $wgUser->isEmailConfirmationPending() ) { |
| 72 | | - $wgOut->addWikiMsg( 'confirmemail_pending' ); |
| | 72 | + $wgOut->wrapWikiMsg( "<div class=\"error mw-confirmemail-pending\">$1</div>", 'confirmemail_pending' ); |
| 73 | 73 | } |
| 74 | 74 | $wgOut->addWikiMsg( 'confirmemail_text' ); |
| 75 | 75 | $self = SpecialPage::getTitleFor( 'Confirmemail' ); |
| 76 | 76 | $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $self->getLocalUrl() ) ); |
| 77 | 77 | $form .= Xml::hidden( 'token', $wgUser->editToken() ); |
| 78 | | - $form .= Xml::submitButton( wfMsgHtml( 'confirmemail_send' ) ); |
| | 78 | + $form .= Xml::submitButton( wfMsg( 'confirmemail_send' ) ); |
| 79 | 79 | $form .= Xml::closeElement( 'form' ); |
| 80 | 80 | $wgOut->addHTML( $form ); |
| 81 | 81 | } |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -3496,8 +3496,8 @@ |
| 3497 | 3497 | Activate the button below to send a confirmation mail to your address. |
| 3498 | 3498 | The mail will include a link containing a code; |
| 3499 | 3499 | load the link in your browser to confirm that your e-mail address is valid.', |
| 3500 | | -'confirmemail_pending' => '<div class="error">A confirmation code has already been e-mailed to you; |
| 3501 | | -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.</div>', |
| | 3500 | +'confirmemail_pending' => 'A confirmation code has already been e-mailed to you; |
| | 3501 | +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.', |
| 3502 | 3502 | 'confirmemail_send' => 'Mail a confirmation code', |
| 3503 | 3503 | 'confirmemail_sent' => 'Confirmation e-mail sent.', |
| 3504 | 3504 | 'confirmemail_oncreate' => 'A confirmation code was sent to your e-mail address. |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -69,6 +69,8 @@ |
| 70 | 70 | * (bug 16604) Show title/rev in IRC for patrol log |
| 71 | 71 | * (bug 16854) Whether a page is being parsed as a preview or section preview |
| 72 | 72 | can now be determined and set with ParserOptions. |
| | 73 | +* Wrap message 'confirmemail_pending' into a div with CSS classes "error" and |
| | 74 | + "mw-confirmemail-pending" |
| 73 | 75 | |
| 74 | 76 | === Bug fixes in 1.15 === |
| 75 | 77 | * (bug 16968) Special:Upload no longer throws useless warnings. |