From fecbd8018738761a7bf08bfe75ddb93d6f7af955 Mon Sep 17 00:00:00 2001
From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Fri, 7 Dec 2007 09:44:47 +0000
Subject: [PATCH] * Only mark rollback edits as minor if the user can normally
 mark edits as minor.

---
 RELEASE-NOTES        | 2 ++
 includes/Article.php | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f07a5cf235..b03a294695 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -226,6 +226,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 12148) Text highlight wasn't applied to cleanly deleted and added
   lines in diff output
 * (bug 10166) Fix a PHP warning in Language::getMagic
+* Only mark rollback edits as minor if the user can normally mark edits as minor.
 
 == Parser changes in 1.12 ==
 
@@ -340,6 +341,7 @@ Full API documentation is available at http://www.mediawiki.org/wiki/API
 * Standardized limits. Revisions and Deletedrevisions formerly using 200 / 10000, 
   now 500 / 5000, in line with other modules.
 
+
 === Languages updated in 1.12 ===
 
 * Afrikaans (af)
diff --git a/includes/Article.php b/includes/Article.php
index 0b1b86942f..f89ceac93c 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -2364,7 +2364,11 @@ class Article {
 			$summary = wfMsgForContent( 'revertpage', $target->getUserText(), $from );
 
 		# Save
-		$flags = EDIT_UPDATE | EDIT_MINOR;
+		$flags = EDIT_UPDATE;
+
+		if ($wgUser->isAllowed('minoredit'))
+			$flags |= EDIT_MINOR;
+
 		if( $bot )
 			$flags |= EDIT_FORCE_BOT;
 		$this->doEdit( $target->getText(), $summary, $flags );
-- 
2.20.1