From 0efdda3f41a39d7c12e63111949bb17dd96f1bd2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Mon, 25 Jul 2005 12:18:25 +0000
Subject: [PATCH] Rollback and delete auto-summaries in the project's content
 language

---
 RELEASE-NOTES        |  2 ++
 includes/Article.php | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 54f96132df..78b04a550c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -606,6 +606,8 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Wrap revision insert & page update in a transaction, rollback on late
   edit conflict.
 * (bug 2953) 'other' didn't work in Special:Blockip when localized
+* (bug 2958) Rollback and delete auto-summary should be in the project's
+  content language
 
 
 === Caveats ===
diff --git a/includes/Article.php b/includes/Article.php
index 1ffe6568cf..d48410473d 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1739,7 +1739,7 @@ class Article {
 			# this should not happen, since it is not possible to store an empty, new
 			# page. Let's insert a standard text in case it does, though
 			if( $length == 0 && $reason === '' ) {
-				$reason = wfMsg( 'exblank' );
+				$reason = wfMsgForContent( 'exblank' );
 			}
 
 			if( $length < 500 && $reason === '' ) {
@@ -1753,12 +1753,12 @@ class Article {
 
 				if( !$blanked ) {
 					if( !$all_same_user ) {
-						$reason = wfMsg( 'excontent', $text );
+						$reason = wfMsgForContent( 'excontent', $text );
 					} else {
-						$reason = wfMsg( 'excontentauthor', $text, $rev_name );
+						$reason = wfMsgForContent( 'excontentauthor', $text, $rev_name );
 					}
 				} else {
-					$reason = wfMsg( 'exbeforeblank', $text );
+					$reason = wfMsgForContent( 'exbeforeblank', $text );
 				}
 			}
 		}
@@ -2029,7 +2029,7 @@ class Article {
 
 		# Save it!
 		$target = Revision::newFromId( $s->rev_id );
-		$newcomment = wfMsg( 'revertpage', $target->getUserText(), $from );
+		$newcomment = wfMsgForContent( 'revertpage', $target->getUserText(), $from );
 
 		$wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
 		$wgOut->setRobotpolicy( 'noindex,nofollow' );
-- 
2.20.1