(bug 28287) The "your changes" box for edit conflicts is now read-only. Patch by...

diff --git a/CREDITS b/CREDITS
index 9f76a0d..caf0fdc 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -122,6 +122,7 @@ following names for their contribution to the product.
 * Mike Horvath
 * Mormegil
 * MrPete
+* MZMcBride
 * Nakon
 * Nathan Larson
 * nephele

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 9a55d4b..64afe59 100644 (file)
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -43,6 +43,7 @@ used in Tiff files.
 * (bug 18803) JPEG2000 images can no longer be uploaded as JPEG image.
 * (bug 11868) If using links to count articles, the checking will now be based
   on the real presence of an internal link instead of the "[[" string
+* (bug 28287) The "your changes" box for edit conflicts is now read-only.
 
 === API changes in 1.19 ===
 * (bug 27790) add query type for querymodules to action=paraminfo

diff --git a/includes/EditPage.php b/includes/EditPage.php
index d8fcdd7..6bffb58 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1740,7 +1740,7 @@ HTML
        }
 
        protected function showTextbox2() {
-               $this->showTextbox( $this->textbox2, 'wpTextbox2', array( 'tabindex' => 6 ) );
+               $this->showTextbox( $this->textbox2, 'wpTextbox2', array( 'tabindex' => 6, 'readonly' ) );
        }
 
        protected function showTextbox( $content, $name, $customAttribs = array() ) {