From 61ab2472d863970561c025eba6ab7c5399aaa681 Mon Sep 17 00:00:00 2001
From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Mon, 19 Oct 2009 17:14:51 +0000
Subject: [PATCH] Self revert r57897. New patch follows.

---
 RELEASE-NOTES        | 2 --
 includes/Article.php | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 05e33c8f2a..22b0ed963a 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -252,8 +252,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Rewrote Special:Upload to allow easier extension. 
 * Upload errors that can be solved by changing the filename now do not require
   reuploading.
-* (bug 21047) Wrap "cannotdelete" message into a div with the generic 'error' 
-  class and a specific 'mw-error-cannotdelete' class
 
 === Bug fixes in 1.16 ===
 
diff --git a/includes/Article.php b/includes/Article.php
index 7d1faab8a6..6de0641828 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -2557,9 +2557,7 @@ class Article {
 		$conds = $this->mTitle->pageCond();
 		$latest = $dbw->selectField( 'page', 'page_latest', $conds, __METHOD__ );
 		if( $latest === false ) {
-			$wgOut->showFatalError(
-				Html::rawElement( 'div', array( 'class' => 'error mw-error-cannotdelete' ), wfMsgExt( 'cannotdelete', array( 'parse' ) ) )
-			);
+			$wgOut->showFatalError( wfMsgExt( 'cannotdelete', array( 'parse' ) ) );
 			$wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) );
 			LogEventsList::showLogExtract(
 				$wgOut,
-- 
2.20.1