* (bug 28444) Fix regression: edit-on-doubleclick retains revision id again

Regression in 61071 caused by dropping $title->getLocalUrl($skin->getEditUrlOptions())
for the less informational $title->getEditUrl(), thus losing oldid view information.
Switching back nicely resolves it.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e3e2072..29e4d0f 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -232,6 +232,7 @@ PHP if you have not done so prior to upgrading MediaWiki.
 * (bug 28306) Fix exposure of suppressed usernames in ForeignDBRepo
 * (bug 28372) Fix bogus link to suppressed file versions in ForeignDBRepo
 * (bug 27473) Fix regression: bold, italic no longer interfere with linktrail for ca, kaa
+* (bug 28444) Fix regression: edit-on-doubleclick retains revision id again
 
 === API changes in 1.18 ===
 * (bug 26339) Throw warning when truncating an overlarge API result

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index e135e07..a484444 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2367,7 +2367,9 @@ class OutputPage {
                        $this->getUser()->getOption( 'editondblclick' )
                )
                {
-                       $bodyAttrs['ondblclick'] = "document.location = '" . Xml::escapeJsString( $this->getTitle()->getEditURL() ) . "'";
+                       $editUrl = $this->getTitle()->getLocalUrl( $sk->editUrlOptions() );
+                       $bodyAttrs['ondblclick'] = "document.location = '" .
+                               Xml::escapeJsString( $editUrl ) . "'";
                }
 
                # Class bloat