(bug 18937) avoid broken wikimarkup (four apostrophes together) in MediaWiki:Confirmr...

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 70e0ca6..5ac268d 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1356,9 +1356,10 @@ HTML
 
                        // It is better to not parse the comment at all than to have templates expanded in the middle
                        // TODO: can the checkLabel be moved outside of the div so that wrapWikiMsg could be used?
+                       $key = $comment ? 'confirmrecreate' : 'confirmrecreate-noreason';
                        $wgOut->addHTML(
                                '<div class="mw-confirm-recreate">' .
-                               wfMsgExt( 'confirmrecreate', 'parseinline', $username, "<nowiki>$comment</nowiki>" ) .
+                               wfMsgExt( $key, 'parseinline', $username, "<nowiki>$comment</nowiki>" ) .
                                Xml::checkLabel( wfMsg( 'recreate' ), 'wpRecreate', 'wpRecreate', false,
                                        array( 'title' => $sk->titleAttrib( 'recreate' ), 'tabindex' => 1, 'id' => 'wpRecreate' )
                                ) .

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index d93e322..b671331 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -4141,6 +4141,7 @@ $1',
 'confirmrecreate'     => "User [[User:$1|$1]] ([[User talk:$1|talk]]) deleted this page after you started editing with reason:
 : ''$2''
 Please confirm that you really want to recreate this page.",
+'confirmrecreate-noreason' => "User [[User:$1|$1]] ([[User talk:$1|talk]]) deleted this page after you started editing.  Please confirm that you really want to recreate this page.",
 'recreate'            => 'Recreate',
 
 'unit-pixel' => 'px', # only translate this message to other languages if you have to change it

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 385dcf4..6b025ee 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -3045,6 +3045,7 @@ $wgMessageStructure = array(
        'deleteconflict' => array(
                'deletedwhileediting',
                'confirmrecreate',
+               'confirmrecreate-noreason',
                'recreate',
        ),
        'unit-pixel' => array(