* Move class=error from message to program code. Other languages will be handled...

* Wrap message 'confirmemail_pending' into a div with CSS classes "error" and "mw-confirmemail-pending"
* Fix double escaping of submit button

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a8ae408..9cb7a27 100644 (file)
--- 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 e19aa99..9c6f857 100644 (file)
--- 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( "<div class=\"error mw-confirmemail-pending\">$1</div>", '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 2db06fc..272f589 100644 (file)
--- 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'     => '<div class="error">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.</div>',
+'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.