| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -1273,9 +1273,14 @@ |
| 1274 | 1274 | $this->showFormBeforeText(); |
| 1275 | 1275 | |
| 1276 | 1276 | if ( $this->wasDeletedSinceLastEdit() && 'save' == $this->formtype ) { |
| | 1277 | + $username = $this->lastDelete->user_name; |
| | 1278 | + $comment = $this->lastDelete->log_comment; |
| | 1279 | + |
| | 1280 | + // It is better to not parse the comment at all than to have templates expanded in the middle |
| | 1281 | + // TODO: can the checkLabel be moved outside of the div so that wrapWikiMsg could be used? |
| 1277 | 1282 | $wgOut->addHTML( |
| 1278 | 1283 | '<div class="mw-confirm-recreate">' . |
| 1279 | | - $wgOut->parse( wfMsg( 'confirmrecreate', $this->lastDelete->user_name , $this->lastDelete->log_comment ) ) . |
| | 1284 | + wfMsgExt( 'confirmrecreate', 'parseinline', $username, "<nowiki>$comment</nowiki>" ) ) . |
| 1280 | 1285 | Xml::checkLabel( wfMsg( 'recreate' ), 'wpRecreate', 'wpRecreate', false, |
| 1281 | 1286 | array( 'title' => $sk->titleAttrib( 'recreate' ), 'tabindex' => 1, 'id' => 'wpRecreate' ) |
| 1282 | 1287 | ) . |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -66,6 +66,7 @@ |
| 67 | 67 | disabling upload protection by removing it from $wgRestrictionTypes. |
| 68 | 68 | * If an edit summary exceeds 250 bytes and is truncated, add an ellipse |
| 69 | 69 | * (bug 26638) Database error pages display correctly in RTL languages |
| | 70 | +* (bug 26187) Confirmrecreate no longer parses the edit summary |
| 70 | 71 | |
| 71 | 72 | === API changes in 1.18 === |
| 72 | 73 | * (bug 26339) Throw warning when truncating an overlarge API result |