| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -2599,7 +2599,8 @@ |
| 2600 | 2600 | // If the page has a history, insert a warning |
| 2601 | 2601 | if( $hasHistory && !$confirm ) { |
| 2602 | 2602 | $skin = $wgUser->getSkin(); |
| 2603 | | - $wgOut->addHTML( '<strong>' . wfMsgExt( 'historywarning', array( 'parseinline' ) ) . ' ' . $skin->historyLink() . '</strong>' ); |
| | 2603 | + $revisions = $this->estimateRevisionCount(); |
| | 2604 | + $wgOut->addHTML( '<strong>' . wfMsgExt( 'historywarning', array( 'parseinline' ), $revisions ) . ' ' . $skin->historyLink() . '</strong>' ); |
| 2604 | 2605 | if( $bigHistory ) { |
| 2605 | 2606 | global $wgLang, $wgDeleteRevisionsLimit; |
| 2606 | 2607 | $wgOut->wrapWikiMsg( "<div class='error'>\n$1</div>\n", |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2676,7 +2676,7 @@ |
| 2677 | 2677 | 'delete-confirm' => 'Delete "$1"', |
| 2678 | 2678 | 'delete-backlink' => '← $1', # only translate this message to other languages if you have to change it |
| 2679 | 2679 | 'delete-legend' => 'Delete', |
| 2680 | | -'historywarning' => "'''Warning:''' The page you are about to delete has a history:", |
| | 2680 | +'historywarning' => "'''Warning:''' The page you are about to delete has a history with $1 {{PLURAL:$1|revision|revisions}}:", |
| 2681 | 2681 | 'confirmdeletetext' => 'You are about to delete a page along with all of its history. |
| 2682 | 2682 | Please confirm that you intend to do this, that you understand the consequences, and that you are doing this in accordance with [[{{MediaWiki:Policy-url}}|the policy]].', |
| 2683 | 2683 | 'actioncomplete' => 'Action complete', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -259,6 +259,8 @@ |
| 260 | 260 | an own 'mw-error-cannotdelete' class |
| 261 | 261 | * New hook AbortNewAccountAuto, called before account creation from AuthPlugin- |
| 262 | 262 | or ExtUser-driven requests. |
| | 263 | +* (bug 3480) The warning saying that the page has a history when deleting it now |
| | 264 | + contains the number of revisions in the history |
| 263 | 265 | |
| 264 | 266 | === Bug fixes in 1.16 === |
| 265 | 267 | |