(bug 17615) nosummary option should be reassigned on preview/captcha

Change-Id: I12f1cf37b7a093ca9f5b949e41fc482c6b7fb5fc

diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index 40dbb32..3d9d333 100644 (file)
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -27,6 +27,7 @@ production.
 * (bug 30963) Option on Special:Prefixindex and Special:Allpages to not show redirects.
 * (bug 18062) new message when edit or create the local page of a shared file
 * (bug 22870) Separate interface message when creating a page
+* (bug 17615) nosummary option should be reassigned on preview/captcha
 
 === Bug fixes in 1.20 ===
 * (bug 30245) Use the correct way to construct a log page title.

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 5e3a964..0b879c1 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1801,6 +1801,11 @@ class EditPage {
                        );
                }
 
+               # When the summary is hidden, also hide them on preview/show changes
+               if( $this->nosummary ) {
+                       $wgOut->addHTML( Html::hidden( 'nosummary', true ) );
+               }
+
                # If a blank edit summary was previously provided, and the appropriate
                # user preference is active, pass a hidden tag as wpIgnoreBlankSummary. This will stop the
                # user being bounced back more than once in the event that a summary