Index: trunk/phase3/RELEASE-NOTES-1.19 |
— | — | @@ -43,6 +43,7 @@ |
44 | 44 | * (bug 18803) JPEG2000 images can no longer be uploaded as JPEG image. |
45 | 45 | * (bug 11868) If using links to count articles, the checking will now be based |
46 | 46 | on the real presence of an internal link instead of the "[[" string |
| 47 | +* (bug 28287) The "your changes" box for edit conflicts is now read-only. |
47 | 48 | |
48 | 49 | === API changes in 1.19 === |
49 | 50 | * (bug 27790) add query type for querymodules to action=paraminfo |
Index: trunk/phase3/CREDITS |
— | — | @@ -122,6 +122,7 @@ |
123 | 123 | * Mike Horvath |
124 | 124 | * Mormegil |
125 | 125 | * MrPete |
| 126 | +* MZMcBride |
126 | 127 | * Nakon |
127 | 128 | * Nathan Larson |
128 | 129 | * nephele |
Index: trunk/phase3/includes/EditPage.php |
— | — | @@ -1740,7 +1740,7 @@ |
1741 | 1741 | } |
1742 | 1742 | |
1743 | 1743 | protected function showTextbox2() { |
1744 | | - $this->showTextbox( $this->textbox2, 'wpTextbox2', array( 'tabindex' => 6 ) ); |
| 1744 | + $this->showTextbox( $this->textbox2, 'wpTextbox2', array( 'tabindex' => 6, 'readonly' ) ); |
1745 | 1745 | } |
1746 | 1746 | |
1747 | 1747 | protected function showTextbox( $content, $name, $customAttribs = array() ) { |