From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 22 Jun 2005 21:38:15 +0000 (+0000)
Subject: * (bug 2488) Format 'deletedtext' message as wikitext
X-Git-Tag: 1.5.0beta1~86
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=2c115d9c6ae367b29976498d8e2ae375ed5c447a;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 29204f35eb..44e89a2aae 100644
--- 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 7884185871..93efa7f556 100644
--- 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 b1a03a77e9..ec39f313b6 100644
--- 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() );
 	}