From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 31 Mar 2011 23:40:51 +0000 (+0000)
Subject: * (bug 27893) Edit-on-doubleclick now applies only on view and purge actions;
X-Git-Tag: 1.31.0-rc.0~31102
X-Git-Url: http://git.cyclocoop.org/wiki/Target_page?a=commitdiff_plain;h=f0eacb35549f10a69f4d5fe67c3ef61b3392d8a3;p=lhc%2Fweb%2Fwiklou.git

* (bug 27893) Edit-on-doubleclick now applies only on view and purge actions;
  no longer triggers unexpectedly on delete, history etc.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bb39275fdb..a1036fb324 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -214,6 +214,8 @@ PHP if you have not done so prior to upgrading MediaWiki.
 * (bug 15641) Fixed positioning of permissions checks in Special:Import which
   allowed users without the 'import' permission to import pages if they directly
   submitted the form.
+* (bug 27893) Edit-on-doubleclick now applies only on view and purge actions;
+  no longer triggers unexpectedly on delete, history etc.
 
 === 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 2fd705d001..e68dca5de7 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2347,7 +2347,7 @@ class OutputPage {
 
 		if (
 			$this->getTitle()->getNamespace() != NS_SPECIAL &&
-			!in_array( $action, array( 'edit', 'submit' ) ) &&
+			in_array( $action, array( 'view', 'purge' ) ) &&
 			$wgUser->getOption( 'editondblclick' )
 		)
 		{