* (bug 4035) Fix prev/next revision links on edit page

also removed extra prev/next header on current version with non-unicode browser

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9045115..78c6e7a 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -270,6 +270,7 @@ fully support the editing toolbar, but was found to be too confusing.
   using revision ID reported via OutputPage; Skin::editUrlOptions()
 * Remove obsolete 'redirect=no' on some edit links
 * Include oldid for the second revision on edit link on diff view
+* (bug 4035) Fix prev/next revision links on edit page
 
 
 === Caveats ===

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 6b3c033..5f7b73c 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -678,13 +678,12 @@ class EditPage {
                        }
                        $wgOut->setPageTitle( $s );
                        if ( !$this->checkUnicodeCompliantBrowser() ) {
-                               $this->mArticle->setOldSubtitle();
                                $wgOut->addWikiText( wfMsg( 'nonunicodebrowser') );
                        }
                        if ( isset( $this->mArticle )
                             && isset( $this->mArticle->mRevision )
                             && !$this->mArticle->mRevision->isCurrent() ) {
-                               $this->mArticle->setOldSubtitle();
+                               $this->mArticle->setOldSubtitle( $this->mArticle->mRevision->getId() );
                                $wgOut->addWikiText( wfMsg( 'editingold' ) );
                        }
                }