* (bug 2488) Format 'deletedtext' message as wikitext

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 29204f3..44e89a2 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -322,6 +322,7 @@ Various bugfixes, small features, and a few experimental things:
 * Restored prior text for password reminder button and e-mail, replacing
   the factually inaccurate text that was there.
 * (bug 2178) Fix temp dir check again
+* (bug 2488) Format 'deletedtext' message as wikitext
 
 
 === Caveats ===

diff --git a/includes/Article.php b/includes/Article.php
index 7884185..93efa7f 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1714,14 +1714,10 @@ class Article {
                                $wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
                                $wgOut->setRobotpolicy( 'noindex,nofollow' );
                                
-                               $sk = $wgUser->getSkin();
-                               $loglink = $sk->makeKnownLink( $wgContLang->getNsText( NS_SPECIAL ) .
-                                                                                          ':Log/delete',
-                                                                                          wfMsg( 'deletionlog' ) );
-                               
+                               $loglink = '[[Special:Log/delete|' . wfMsg( 'deletionlog' ) . ']]';
                                $text = wfMsg( 'deletedtext', $deleted, $loglink );
                                
-                               $wgOut->addHTML( '<p>' . $text . "</p>\n" );
+                               $wgOut->addWikiText( $text );
                                $wgOut->returnToMain( false );
                                wfRunHooks('ArticleDeleteComplete', array(&$this, &$wgUser, $reason));
                        } else {

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index b1a03a7..ec39f31 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -466,14 +466,11 @@ class ImagePage extends Article {
                $wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
                $wgOut->setRobotpolicy( 'noindex,nofollow' );
 
-               $sk = $wgUser->getSkin();
-               $loglink = $sk->makeKnownLinkObj(
-                       Title::makeTitle( NS_SPECIAL, 'Log/delete' ),
-                       wfMsg( 'deletionlog' ) );
-
+               $loglink = '[[Special:Log/delete|' . wfMsg( 'deletionlog' ) . ']]';
                $text = wfMsg( 'deletedtext', $deleted, $loglink );
+               
+               $wgOut->addWikiText( $text );
 
-               $wgOut->addHTML( '<p>' . $text . "</p>\n" );
                $wgOut->returnToMain( false, $this->mTitle->getPrefixedText() );
        }