Self revert r57897. New patch follows.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 05e33c8..22b0ed9 100644 (file)
--- 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 7d1faab..6de0641 100644 (file)
--- 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,