* (bug 4482) Include move comment on the null edit as well as the redirect

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b51faac..c0cbe8e 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -498,6 +498,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * Added an attractive space on the namespace selector on contribs
 * Move PHP 5-friendly XHTML doctype hack to Sanitizer, use for sig checks.
   Fixes use of named entities in sigs on PHP 5
+* (bug 4482) Include move comment on the null edit as well as the redirect
 
 
 === Caveats ===

diff --git a/includes/Title.php b/includes/Title.php
index 33d7ef3..c88e062 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1676,9 +1676,7 @@ class Title {
                $dbw->delete( 'page', array( 'page_id' => $newid ), $fname );
 
                # Save a null revision in the page's history notifying of the move
-               $nullRevision = Revision::newNullRevision( $dbw, $oldid,
-                       wfMsgForContent( '1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() ),
-                       true );
+               $nullRevision = Revision::newNullRevision( $dbw, $oldid, $comment, true );
                $nullRevId = $nullRevision->insertOn( $dbw );
 
                # Change the name of the target page:
@@ -1750,9 +1748,7 @@ class Title {
                $linkCache =& LinkCache::singleton();
 
                # Save a null revision in the page's history notifying of the move
-               $nullRevision = Revision::newNullRevision( $dbw, $oldid,
-                       wfMsgForContent( '1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() ),
-                       true );
+               $nullRevision = Revision::newNullRevision( $dbw, $oldid, $comment, true );
                $nullRevId = $nullRevision->insertOn( $dbw );
 
                # Rename cur entry