From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Tue, 7 Nov 2006 12:53:07 +0000 (+0000)
Subject: * (bug 5365) Stop users being prompted to enter an edit summary for null edits, if... 
X-Git-Tag: 1.31.0-rc.0~55264
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%20%22id_auteur=%24id%22%29%20.%20%22?a=commitdiff_plain;h=b33cc4bb0902d405997ea3250fed905616c22f12;p=lhc%2Fweb%2Fwiklou.git

* (bug 5365) Stop users being prompted to enter an edit summary for null edits, if they have selected that option in preferences.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 27cb30446f..9c012c1525 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -149,7 +149,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 7819) Move automatic redirect edit summary after pre-save transform
   to work properly with subst: fun
 * (bug 7826) Fix typos in two English messages.
-
+* (bug 5365) Stop users being prompted to enter an edit summary for null edits,
+  if they have selected that option in preferences.
 
 == Languages updated ==
 
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 5a3e67c20a..3017005830 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -723,8 +723,11 @@ class EditPage {
 			return true;
 		}
 
-		# Handle the user preference to force summaries here
-		if( $this->section != 'new' && !$this->allowBlankSummary && $wgUser->getOption( 'forceeditsummary' ) ) {
+		$oldtext = $this->mArticle->getContent();
+
+		# Handle the user preference to force summaries here, but not for null edits
+		if( $this->section != 'new' && !$this->allowBlankSummary && $wgUser->getOption( 'forceeditsummary')
+			&&  0 != strcmp($oldtext, $text) ) {
 			if( md5( $this->summary ) == $this->autoSumm ) {
 				$this->missingSummary = true;
 				wfProfileOut( $fname );