* (bug 26187) Confirmrecreate no longer parses the edit summary

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ac50703..2527917 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -66,6 +66,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   disabling upload protection by removing it from $wgRestrictionTypes.
 * If an edit summary exceeds 250 bytes and is truncated, add an ellipse
 * (bug 26638) Database error pages display correctly in RTL languages
+* (bug 26187) Confirmrecreate no longer parses the edit summary
 
 === API changes in 1.18 ===
 * (bug 26339) Throw warning when truncating an overlarge API result

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 30e01e7..7b72c51 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1273,9 +1273,14 @@ HTML
                $this->showFormBeforeText();
 
                if ( $this->wasDeletedSinceLastEdit() && 'save' == $this->formtype ) {
+                       $username = $this->lastDelete->user_name;
+                       $comment = $this->lastDelete->log_comment;
+       
+                       // 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?
                        $wgOut->addHTML(
                                '<div class="mw-confirm-recreate">' .
-                               $wgOut->parse( wfMsg( 'confirmrecreate',  $this->lastDelete->user_name , $this->lastDelete->log_comment ) ) .
+                               wfMsgExt( 'confirmrecreate', 'parseinline', $username, "<nowiki>$comment</nowiki>"  ) ) .
                                Xml::checkLabel( wfMsg( 'recreate' ), 'wpRecreate', 'wpRecreate', false,
                                        array( 'title' => $sk->titleAttrib( 'recreate' ), 'tabindex' => 1, 'id' => 'wpRecreate' )
                                ) .