From f752c9364bd5c0063acf8852d0ff71445523984c Mon Sep 17 00:00:00 2001
From: Rotem Liss <rotem@users.mediawiki.org>
Date: Fri, 24 Nov 2006 19:06:35 +0000
Subject: [PATCH] (bug 8009) Automatic edit summary for redirects is not filled
 for edits in existing pages

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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 40ffd5cb39..68c08987b1 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -213,6 +213,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
    can be protected from autoblocking. These ranges are specified, in list format,
    in the autoblock_whitelist system message.
 * Added placeholders for text injection by hooks to EditPage.php
+* (bug 8009) Automatic edit summary for redirects is not filled for edits in existing pages
 
 == Languages updated ==
 
diff --git a/includes/Article.php b/includes/Article.php
index e5e3414d6b..83bb88e6df 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -2697,17 +2697,15 @@ class Article {
 
 		$summary = '';
 
-		#Blanking autosummaries
-		if (!($flags & EDIT_NEW))
-			$summary = self::getBlankingAutosummary( $oldtext, $newtext );
+		#Redirect autosummaries
+		$summary = self::getRedirectAutosummary( $newtext );
 
 		if ($summary)
 			return $summary;
 
-		#New redirect autosummaries.
-		if ( $flags & EDIT_NEW ) {
-			$summary = self::getRedirectAutosummary( $newtext );
-		}
+		#Blanking autosummaries
+		if (!($flags & EDIT_NEW))
+			$summary = self::getBlankingAutosummary( $oldtext, $newtext );
 
 		if ($summary)
 			return $summary;
-- 
2.20.1