(bug 8009) Automatic edit summary for redirects is not filled for edits in existing...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 40ffd5c..68c0898 100644 (file)
--- 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 e5e3414..83bb88e 100644 (file)
--- 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;