http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88122

Revision: 88122
Author:   emufarmers
Date:     2011-05-14 22:57:55 +0000 (Sat, 14 May 2011)
Log Message:
-----------
(bug 28287) The "your changes" box for edit conflicts is now read-only.  Patch 
by MZMcBride.

Modified Paths:
--------------
    trunk/phase3/CREDITS
    trunk/phase3/RELEASE-NOTES-1.19
    trunk/phase3/includes/EditPage.php

Modified: trunk/phase3/CREDITS
===================================================================
--- trunk/phase3/CREDITS        2011-05-14 22:53:31 UTC (rev 88121)
+++ trunk/phase3/CREDITS        2011-05-14 22:57:55 UTC (rev 88122)
@@ -122,6 +122,7 @@
 * Mike Horvath
 * Mormegil
 * MrPete
+* MZMcBride
 * Nakon
 * Nathan Larson
 * nephele

Modified: trunk/phase3/RELEASE-NOTES-1.19
===================================================================
--- trunk/phase3/RELEASE-NOTES-1.19     2011-05-14 22:53:31 UTC (rev 88121)
+++ trunk/phase3/RELEASE-NOTES-1.19     2011-05-14 22:57:55 UTC (rev 88122)
@@ -43,6 +43,7 @@
 * (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

Modified: trunk/phase3/includes/EditPage.php
===================================================================
--- trunk/phase3/includes/EditPage.php  2011-05-14 22:53:31 UTC (rev 88121)
+++ trunk/phase3/includes/EditPage.php  2011-05-14 22:57:55 UTC (rev 88122)
@@ -1740,7 +1740,7 @@
        }
 
        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() ) {


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to