* (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 bb39275..a1036fb 100644 (file)
--- 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 2fd705d..e68dca5 100644 (file)
--- 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' )
                )
                {