* Only mark rollback edits as minor if the user can normally mark edits as minor.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f07a5cf..b03a294 100644 (file)
--- 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 0b1b869..f89ceac 100644 (file)
--- 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 );