| Index: trunk/phase3/includes/specials/SpecialUndelete.php |
| — | — | @@ -642,7 +642,7 @@ |
| 643 | 643 | $this->showList( $result ); |
| 644 | 644 | } |
| 645 | 645 | } else { |
| 646 | | - $wgOut->addWikiText( wfMsgHtml( 'undelete-header' ) ); |
| | 646 | + $wgOut->addWikiMsg( 'undelete-header' ); |
| 647 | 647 | } |
| 648 | 648 | return; |
| 649 | 649 | } |
| — | — | @@ -763,7 +763,7 @@ |
| 764 | 764 | $wgOut->addHTML( '<hr />' ); |
| 765 | 765 | } |
| 766 | 766 | } else { |
| 767 | | - $wgOut->addHTML( wfMsgHtml( 'undelete-nodiff' ) ); |
| | 767 | + $wgOut->addWikiMsg( 'undelete-nodiff' ); |
| 768 | 768 | } |
| 769 | 769 | } |
| 770 | 770 | |
| — | — | @@ -774,13 +774,16 @@ |
| 775 | 775 | $t = htmlspecialchars( $wgLang->time( $timestamp, true ) ); |
| 776 | 776 | $user = $skin->revUserTools( $rev ); |
| 777 | 777 | |
| 778 | | - $wgOut->addHTML( '<p>' . wfMsgHtml( 'undelete-revision', $link, $time, $user, $d, $t ) . '</p>' ); |
| | 778 | + if( $this->mPreview ) { |
| | 779 | + $openDiv = '<div id="mw-undelete-revision" class="mw-warning">'; |
| | 780 | + } else { |
| | 781 | + $openDiv = '<div id="mw-undelete-revision">'; |
| | 782 | + } |
| 779 | 783 | |
| | 784 | + $wgOut->addHTML( $openDiv . wfMsgWikiHtml( 'undelete-revision', $link, $time, $user, $d, $t ) . '</div>' ); |
| 780 | 785 | wfRunHooks( 'UndeleteShowRevision', array( $this->mTargetObj, $rev ) ); |
| 781 | 786 | |
| 782 | 787 | if( $this->mPreview ) { |
| 783 | | - $wgOut->addHTML( "<hr />\n" ); |
| 784 | | - |
| 785 | 788 | //Hide [edit]s |
| 786 | 789 | $popts = $wgOut->parserOptions(); |
| 787 | 790 | $popts->setEditSection( false ); |
| — | — | @@ -941,7 +944,7 @@ |
| 942 | 945 | $wgOut->setPagetitle( wfMsg( 'viewdeletedpage' ) ); |
| 943 | 946 | } |
| 944 | 947 | |
| 945 | | - $wgOut->addWikiText( wfMsgHtml( 'undeletepagetitle', $this->mTargetObj->getPrefixedText()) ); |
| | 948 | + $wgOut->addWikiMsg( 'undeletepagetitle', $this->mTargetObj->getPrefixedText() ); |
| 946 | 949 | |
| 947 | 950 | $archive = new PageArchive( $this->mTargetObj ); |
| 948 | 951 | /* |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -323,6 +323,7 @@ |
| 324 | 324 | skins |
| 325 | 325 | * Fixed a PHP notice when $wgEnableSerializedMessages was set to false |
| 326 | 326 | * (bug 18316) Removed superfluous name="fulltext" from Special:Search |
| | 327 | +* (bug 18331) MediaWiki:Undelete-revision can now have wikitext |
| 327 | 328 | |
| 328 | 329 | == API changes in 1.15 == |
| 329 | 330 | * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions |