| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -2557,7 +2557,13 @@ |
| 2558 | 2558 | $conds = $this->mTitle->pageCond(); |
| 2559 | 2559 | $latest = $dbw->selectField( 'page', 'page_latest', $conds, __METHOD__ ); |
| 2560 | 2560 | if( $latest === false ) { |
| 2561 | | - $wgOut->showFatalError( wfMsgExt( 'cannotdelete', array( 'parse' ) ) ); |
| | 2561 | + $wgOut->showFatalError( |
| | 2562 | + Html::rawElement( |
| | 2563 | + 'div', |
| | 2564 | + array( 'class' => 'error mw-error-cannotdelete' ), |
| | 2565 | + wfMsgExt( 'cannotdelete', array( 'parse' ), $this->mTitle->getPrefixedText() ) |
| | 2566 | + ) |
| | 2567 | + ); |
| 2562 | 2568 | $wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) ); |
| 2563 | 2569 | LogEventsList::showLogExtract( |
| 2564 | 2570 | $wgOut, |
| — | — | @@ -2801,7 +2807,13 @@ |
| 2802 | 2808 | } |
| 2803 | 2809 | } else { |
| 2804 | 2810 | if( $error == '' ) { |
| 2805 | | - $wgOut->showFatalError( wfMsgExt( 'cannotdelete', array( 'parse' ) ) ); |
| | 2811 | + $wgOut->showFatalError( |
| | 2812 | + Html::rawElement( |
| | 2813 | + 'div', |
| | 2814 | + array( 'class' => 'error mw-error-cannotdelete' ), |
| | 2815 | + wfMsgExt( 'cannotdelete', array( 'parse' ), $this->mTitle->getPrefixedText() ) |
| | 2816 | + ) |
| | 2817 | + ); |
| 2806 | 2818 | $wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) ); |
| 2807 | 2819 | LogEventsList::showLogExtract( |
| 2808 | 2820 | $wgOut, |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -991,7 +991,7 @@ |
| 992 | 992 | 'unexpected' => 'Unexpected value: "$1"="$2".', |
| 993 | 993 | 'formerror' => 'Error: could not submit form', |
| 994 | 994 | 'badarticleerror' => 'This action cannot be performed on this page.', |
| 995 | | -'cannotdelete' => 'Could not delete the page or file specified. |
| | 995 | +'cannotdelete' => 'The page or file "$1" could not be deleted. |
| 996 | 996 | It may have already been deleted by someone else.', |
| 997 | 997 | 'badtitle' => 'Bad title', |
| 998 | 998 | 'badtitletext' => 'The requested page title was invalid, empty, or an incorrectly linked inter-language or inter-wiki title. |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -256,6 +256,8 @@ |
| 257 | 257 | rate limits. |
| 258 | 258 | * (bug 21222) When $wgUseTeX is not enabled, <math> is no longer registered with |
| 259 | 259 | the parser so extensions are free to implement their own <math> tag |
| | 260 | +* (bug 21047) Wrap 'cannotdelete' into a div with the generic 'error' class and |
| | 261 | + an own 'mw-error-cannotdelete' class |
| 260 | 262 | |
| 261 | 263 | === Bug fixes in 1.16 === |
| 262 | 264 | |