From 77da0488dc4f659d51a190ce63c67ecdd1438154 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 6 Apr 2011 21:58:10 +0000 Subject: [PATCH] * (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. --- RELEASE-NOTES | 1 + includes/OutputPage.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index e3e2072584..29e4d0f9a6 100644 --- 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 e135e072a6..a484444978 100644 --- 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 -- 2.20.1